Merge pull request #11 from marc-roopchand/master

Merged Templates
fixed css issues
Merge pull request #12 from r3bhatta/master

fixed css issues
Correct use of HTML5 tags