html5 boilerplate base
resolving merge issues