Init Commit
Merge branch 'master' of https://github.com/mrose15/michelehrose

Conflicts:
	.gitignore