haml fix
Merge branch 'Klopsch'
Merge branch 'master' of github.com:Klopsch/finalproject