FIXED EVERYTHING LITERALLY
i think this worked
Merge branch 'master' into TheHeroicBranch

Conflicts:
	.metadata/.log
Merge pull request #8 from cdavis21/TheHeroicBranch

FIXED EVERYTHING LITERALLY