created data models
temp
conflit fix
conflict done
datamodel reader
fixed NSString
done fb token passing