new menu
new menu
Merge remote-tracking branch 'origin/final-design' into final-design

Conflicts:
	templates/blog/base.html
Merge remote-tracking branch 'origin/final-design' into final-design
Merge remote-tracking branch 'origin/final-design' into final-design
new menu