hintbox undone
Merge branch 'master' of https://github.com/CS307/PUBT

Conflicts:
	app/views/base.blade.php