Pushing a dummy html5 template, just for testing
Adding changes to the readme file
Conflict solved