trying to understand branches and failing
Merge branch 'next' of https://github.com/LauraHilliger/webmaker-curriculum into LauraHilliger-next

Conflicts:
	.DS_Store
Merge branch 'LauraHilliger-next' into next