fixed nesting issue
Merge branch 'master' of github.com:handraise-project/handraise-app