No funciona ni de broma :(
Merge branch 'master' of https://github.com/Arkalex/PeachStore

Conflicts:
	bbdd/apps.txt