Changes to be committed:
	modified:   index.html
	modified:   style.css
Merge https://github.com/linuxxnut/start-page

Conflicts:
	index.html