adds new route handling
addresses PR comments
sqashed commits
Merge branch 'master' into feature/routes

Conflicts:
	app.rb
	db/schema.rb
resolved schema conflict
modified docs
removed ability to change email
fixed comment
added 404's
Merge pull request #7 from cs27x/feature/routes

Feature/routes