Refactored html
Merged Templates
Merge pull request #11 from marc-roopchand/master

Merged Templates