replaced everything with html5 boilerplate template
merge fix