Fixing some git issues
Merge branch 'master' of https://github.com/tlukasiak/recapp-frontend