Merge branch 'master' of https://github.com/wingart/nadivane

Conflicts:
	css/styles.css
Merge branch 'master' of https://github.com/wingart/nadivane