Initial commit
Merge branch 'master' of https://github.com/SweatGland/kirkfinley

Conflicts:
	.gitignore