Templates files
Merge branch 'master' of github.com:hackteam/hackagong
Adds index
fixes conflicts