removed .classpath from git
Merge branch 'master' of http://github.com/maslab-team/maslab-2014-team17

Conflicts:
	robot/.classpath