fixed everything!!! sort of
Merge branch 'master' of https://github.com/aakashthumaty/Anon

Conflicts:
	Anon/Anon/Base.lproj/Main.storyboard