make git track Makefile
add notes related to ROS workspace settings
Merge pull request #21 from tttor/tmp

Fix .gitignore to consider Makefile
Merge remote-tracking branch 'upstream/master'