ignore project
Merge branch 'master' of https://github.com/emmateo/PrototApp

Conflicts:

PrototApp.xcodeproj/project.xcworkspace/xcshareddata/PrototApp.xccheckou
t