Arzan - please ignore
a
Merge branch 'master' of https://github.com/dbashford/mimosa.io

Conflicts:
	.DS_Store
	index.html