added stuff?
Merge branch 'master' of https://github.com/cpottamus/EECS339_Project_2 into home_page

* 'master' of https://github.com/cpottamus/EECS339_Project_2:
  added stuff?
new page routes and tmpl files