added new html and style
Merge branch 'origin/master'

Conflicts:
	src/templates/home.html
Merged with master