added aside
Merge branch 'newsidebar'

Conflicts:
	test2.htm
Merge branch 'master' of https://github.com/andrewhaw/test