merged
add .gitignore
Merge branch 'master' of https://github.com/nurinamu/multi_galaga

Conflicts:
	war/WEB-INF/appengine-generated/local_db.bin
	war/WEB-INF/lib/appengine-api-labs.jar
	war/WEB-INF/lib/appengine-endpoints.jar
Merge branch 'master' of https://github.com/nurinamu/multi_galaga