just viewing stuff
fixed known conflicts
cleaned up routes and commented code
Merge pull request #18 from dbcfoxes2014/cleaning_up

Cleaning up