committing
Merge branch 'master' of https://github.com/mainmango/mainmango.github.io

Conflicts:
	index.htmlr