last commit before merge
last commit before merge
Merge branch 'master' of https://github.com/mdotson1/cs338f13p3

Conflicts:
	app/views/templates/debug.scala.html