.
Progress on side buttons
Merge branch 'master' of https://github.com/yigh/NastyNarwhal

Conflicts:
	assets/css/styles.css
	assets/img/.DS_Store
Merge branch 'master' of https://github.com/yigh/NastyNarwhal