Committing changes to Makefile on SuSE
Merging with proper Makefile from 104A
Merge branch 'Ajay' of https://github.com/amccaleb/UCSC-Rover-2014 into Ajay
Cleaned up the Makefile