ignoring
Merge branch 'VikrumBranch' into tarandeepBranch

Conflicts:

Fynd.xcodeproj/project.xcworkspace/xcuserdata/tsaggu.xcuserdatad/UserInt
erfaceState.xcuserstate
ignoring
Merge branch 'master' into tarandeepBranch

Conflicts:

Fynd.xcodeproj/project.xcworkspace/xcuserdata/tsaggu.xcuserdatad/UserInt
erfaceState.xcuserstate
.gitignore?
trying to ignore again
wtf
Merge branch 'master' into tarandeepBranch

Conflicts:
	Fynd/PinViewController.m
got rid of it
OMG MENU WORKS
Merge branch 'tarandeepBranch'

Conflicts:
	Fynd/PinViewController.m