no message
Merge branch 'master' of https://github.com/UA-CS491-591/WHNewsReader
no message
Merge branch 'master' of https://github.com/UA-CS491-591/WHNewsReader

Conflicts:
	WHNewsReader/Pods/Pods.xcodeproj/project.pbxproj