fb y twitter
Merge branch 'master' of https://github.com/DP2iOS2014/darsapp

Conflicts:
	darsapp/Base.lproj/Main_iPhone.storyboard