initial
Merge branch 'master' of https://github.com/justinhammack/mustard.ly

Resolved Conflicts:
	.gitignore