Add .gitignore
Merge branch 'master' of github.com:turt2live/Messenger
Use java 1.7