it's working!?
Merge branch 'master' of https://github.com/danaeinsidler/danaeinsidler.github.io

Conflicts:
	homework/index.html