init commit
Merge branch 'master' of github.com:jakesorce/cottonwood-coding

Conflicts:
	.gitignore