1.0
Merge branch 'master' of https://github.com/DaveTheHo/week3-homework into DaveTheHo-master

Conflicts:
	.DS_Store
Merge branch 'DaveTheHo-master'