my code for Part 1 (incl. Extra Credit)
Resolved conflict in README.md

Conflicts:
	README.md