night pic
Merge branch 'master' of https://github.com/natehsu/102iOS_project

Conflicts:
	AquaCrossRiver/AquaCrossRiver.xcodeproj/project.pbxproj

AquaCrossRiver/AquaCrossRiver.xcodeproj/project.xcworkspace/xcuserdata/n
ate.xcuserdatad/UserInterfaceState.xcuserstate