Set up angular routing
Fixes for routing
Fixed referencing wrong state name
Added contact state
Merge nathancheek-router with master
Merge branch 'master'

Conflicts:
	public/index.html
	public/partials/navbarNoAuth.html