template changes, take css and js out
Merge branch 'master' of github.com:ctzsm/HCI_prototype