Finalizing routes and views.
Merge branch 'master' into lindsey

Conflicts:
	app/routes.php
Merge pull request #8 from jloehman/lindsey

Finalizing routes and views.