Initial Commit
Merge branch 'master' of https://github.com/blaisebaileyfinnegan/database

Conflicts:
	.gitignore