.gitignore and server and eclipse files should be working now
Merge branch 'master' of github.com:pranner/PhotoBomb

Files were merged together that caused errors