Merge html5-boilerplate