small haml modification
resolved haml merge
Merge branch 'master' of https://github.com/kennyszub/forward-tutoring
merge changes