Users. Parse.
Merge branch 'master' of https://github.com/GalOshri/Assassins

Conflicts:
	iOS/Assassins.xcodeproj/project.pbxproj
	iOS/Assassins/ViewController.m