v1.2.0
Merge branch 'hierarchy'

Conflicts:
	css/main.css
	index.html