yes delete
yes
oh em gee
v1.3
Merge branch 'hierarchy'

Conflicts:
	css/main.css
	index.html
yes
Update index.html
oooook
Merge branch 'master' of https://github.com/amybynm/MDD_1405

Conflicts:
	css/main.css
	index.html
v4