ignore
Merge branch 'master' of https://github.com/htmelvis/htmelvis

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/htmelvis/htmelvis
Added simple styles