Working on templating system that will allow for printing
Merge branch 'master' of github.com:stmian/CSE360_Team-1