asd
xcuserstate
a
a
xcuserstate
Merge branch 'master' of https://github.com/waihungc/Daily-Trojan

Conflicts:
	Daily Trojan.xcodeproj/project.xcworkspace/xcshareddata/Daily
Trojan.xccheckout
	Daily Trojan/PhotoAlbum.h
	Daily Trojan/PhotoAlbum.m