added .settings/org.eclipse.jdt.core.prefs to .gitignore
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git