Update gitignore
Add classpath
Fix conflict gitignore
Merge branch 'develop' of https://github.com/Benn83uk/SpaceAppsChallenge2014 into develop