modified:   .gitignore
Merge branch 'master' of https://github.com/gt-ros-pkg/hrl-summer-2014