Week 3 draft
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
fix merge
Merge pull request #1 from Avans/master

update