error pages
tests won't run
cleanup
cleanup
cleanup
Merge pull request #155 from empirical-org/EdinaVath-404-page

EdinaVath/404-page
Merge branch 'master' into refactor

Conflicts:
	config/routes.rb