Fixed scss
Merge branch 'master' of http://github.com/tsuwatch/ma9

Conflicts:
	edison/app/views/new.blade.php
	edison/public/css/base.css