added a few match updates
Merge branch 'master' of https://github.com/jamestvu/TextBookMania

Conflicts:
	app/controllers/Application.java