Masonry, first implementation
Merge branch 'master' of https://github.com/codereggie/childofreggie.git

Conflicts:
	war/posters.jsp