no message
Merge branch 'master' of github.com:TAwesome/Capstone

# By Rissa Waters
# Via Jillian Donovan (1) and Rissa Waters (1)
* 'master' of github.com:TAwesome/Capstone:
  404 page things

Conflicts:
	app/views/errors/missing.blade.php