created all routes and views, untested
Merge branch 'master' into shakrah_mark
complete initial controllers and views