up
Merge branch 'master' of https://github.com/d3volv3d/gemr.com

Conflicts:
	.DS_Store