get latest Marlin_v1 changes

DEADJOE

@@ -0,0 +1,53 @@
+
+*** These modified files were found in JOE when it aborted on Wed Nov 26 20:52:44 2014
+*** JOE was aborted because the terminal closed
+
+*** File '/Volumes/Projects/MAKER/Firmware/Marlin-thinkyhead/.git/MERGE_MSG'
+Merge remote-tracking branch 'upstream/Marlin_v1' into lcd_wait_better
+
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.
+
+*** File '(Unnamed)'
+sort
+echo
+
+*** File '(Unnamed)'
+d7
+/drupal7
+3bl-justmeans-wp/editorial
+SLICER_HOME
+remindmeinbox
+&>
+8
+alchemist
+/Users/lordscott/Sites/git.loc
+goth
+
+*** File '(Unnamed)'
+mysql
+socket
+.sock
+error_repo
+zone
+ini_set
+localhost
+/Library/WebServer/Documents/gitprojects
+mydemoproject1
+alias
+
+*** File '(Unnamed)'
+/Users/lordscott/bin/clean
+thinkyhead.conf
+/etc/hosts
+thinkyhead.conf
+drupal7.conf
+thinkyhead.conf
+thinkyhead.conf
+thinkyhead.conf
+drupal7.conf
+thinkyhead.conf
+/Volumes/Projects/MAKER/Firmware/Marlin-thinkyhead/.git/MERGE_MSG