Merge branch 'master' of https://github.com/shamor/Senior-Design-I

And minor changes to make file

Conflicts:
	Makefile
	src/RobotComm.cpp~
	src/main.cpp~
Can do some pseudo drawing with the robot arm.
Delete drawImageSimulator.h~
Delete RobotComm.cpp~
Delete main.cpp~
Delete drawLine.cpp~
cleaning up the repo
Merge branch 'master' of https://github.com/shamor/Senior-Design-I
Merging with josh.
 Merged with josh.
fixed makefile.
Implemented new way of using the serial port. Communication finally works in basic forms.
Serial communication is working. In most basic stages and two digit chars are being converted to ints properly.
Communication with robot is function and accounts for pseudo time it takes to draw the line.
Forgot a file on the last commit
merge with sam
updating with my own branchMerge branch 'master' of https://github.com/sbonner1/Senior-Design-I