Add entry to .gitignore, tidy up AdditionServer.java
Merge branch 'master' of https://github.com/teddyaryono/smart-house-server