pushing for the sake of pushing
Merge branch 'master' of http://github.com/chorn21/snowmenu

Conflicts:
	menu/views.pyc
	snowmenu/urls.pyc