gitignore
Merge branch 'master' into classwork

Conflicts:
	.gitignore
Day 1
Day 2
Day 3
Day 4
Update readme
Day 4

amended
Merge pull request #1 from Phroa/classwork

Don't need three branches