fixing merge issue public/views/index.html
2nd fix on merge issue
Merge branch 'master' of https://github.com/tillreiter/pleasetakeit
Merge branch 'master' of https://github.com/tillreiter/pleasetakeit
fixed controllers deal functions
fixed controller deal functions and merge conflict