Initial commit
Merge branch 'master' of https://github.com/ZingDesign/Sandbox

Conflicts:
	.gitignore