Added UI elements — will be changed
Merge remote-tracking branch 'origin/master' into UI
n/a
UI updates
Updated UI
fuck
Merge branch 'ui'

Conflicts:
	Cropr.xcodeproj/project.pbxproj

Cropr.xcodeproj/project.xcworkspace/xcuserdata/Ben.xcuserdatad/UserInter
faceState.xcuserstate
dunno