Merge branch 'master' of https://github.com/pabloformoso/GamificationSite
gitignore
Merge branch 'develop' of https://github.com/pabloformoso/GamificationSite into develop

* 'develop' of https://github.com/pabloformoso/GamificationSite:
  gitignore