updated with some code to be merged
Merge branch 'master' into server_release

master
updated to have server code that returns skills with all the profiles
wrong merge
pbxproj
merge
updated to not have stupidity
IMAGE UPLOADDDDD
merge
Merge branch 'server_release' of https://github.com/adiagarwalla/cos333 into server_release

merge
makefile for simple cleans
endpoint for setting push notification token
updated
some useless update
changes for images and skill edit
Merge branch 'server_release' of https://github.com/adiagarwalla/cos333 into server_release

merge
updated
merge
some changes
updated