added toolbar.tmpl
merge conflicts
added some files?
moar changes
Merge branch 'portfolio_pages' of https://github.com/cpottamus/EECS339_Project_2 into home_page

* 'portfolio_pages' of https://github.com/cpottamus/EECS339_Project_2:
  moar changes
  added some files?
  added toolbar.tmpl
html for last template