merge lsjkf
Merge branch 'master' of github.com:rss-2014-team-6/rss-team-6-state-machine
diffrent bump behavior
Merge branch 'master' of github.com:rss-2014-team-6/rss-team-6-state-machine