hacker
merge
Merge branch 'master' of https://github.com/SatinderpalSingh/website

Conflicts:
	css/style.css~
	index.html
	index.html~