CMD + S
Fix conflict
Adding Procfile
Update Procfile
Merge branch 'Fabricio' into defcon-4
Merge branch 'defcon-4'
Update app and generator
Adding resources
Merge branch 'master' into Fabricio
Final Peso