front end
Merge branch 'master' of https://github.com/pintugame/pintugame.github.io

Conflicts:
	css/style.css
	index.html