Merged in html5 boiler plate