jhkgh
Merge branch 'gh-pages' of github.com:aerovin/mascot

Conflicts:
	stylesheets/styles.css