jkunkle/usercode — pull request #2 by cranelli (2014-10-23 18:12:06+00:00)
Title: Issue with Merging, have gone back to Josh's UpdateMakeFile commit + my ...

...changes