did i just fix it?
Merge branch 'master' of https://github.com/whoisglover/phase_0_unit_2

Conflicts:
	.gitignore