Fix typo ^_^
Merge branch 'use_haml'
Merge remote-tracking branch 'origin/master'