Initial Commit
Merge branch 'master' of github.com:cloud6/ducking-octo-lana

Conflicts:
	.gitignore