modified the README file for testing git
added a second line to the README for further testing git
Merge branch 'branch-02232014' of https://github.com/asdfvar/robot into branch-02232014

Conflicts:
	README
Added robot.cpp and Makefile and mappath.py algorithm
Added clean to Makefile