conflict file before pulling
Merge branch 'master' of https://github.com/manicwombat/turnitup-beta.git
change to use Parse - mobile app platform handling the stored data