Fixed Templates
Merge branch 'master' of https://github.com/rshin808/HVProject