tradition and history re-layout
Merge branch 'master' of github.com:janastu/dasara-prototype

Conflicts:
	css/theme.css