Not really sure.
Merge branch 'master' of https://github.com/codereggie/childofreggie.git

Conflicts:
	war/WEB-INF/appengine-generated/local_db.bin
	war/posters.jsp