Merge of development and master branch
Added Social Links to Artist Profiles
Had to do this in order to merge
Merge branch 'master' into Development

Conflicts:

YesTattoo/YesTattoo.xcodeproj/project.xcworkspace/xcuserdata/nestorzeped
a.xcuserdatad/UserInterfaceState.xcuserstate
Added navigation between all controllers

This is just navigation, info and map views still need to be updated
Added the Google Maps and required frameworks
Deleted Google Maps. Will use Apple Maps instead
integrated Facebook cocoapod. USE XWORKSPACE NOW
created the login controller/added parallax effect
Added Artist Info page

This still needs work. Bug where the UILabel doesn’t format correctly
needs to be fixed.
Added Artist search

Need to work on UI and work on bug that causes non loading on the
picture thumbnail when seaching
Added signup login page

Not yet functioning, need to implement PFUser creation.
Added user sign up and login!!

Users can now sign up and login. All user credentials are stored on
parse.
Added Tab Bar!!
Little improvements
Bug fixes
Added navigation bar imitation like instagram
minor changes (UI)
Added user profile (still needs to be finished)
Merge branch 'Development'