View Controller and IBOutlets
Merge branch 'master' into feature/iphone-first-pass

Conflicts:
	TravelGuide.xcodeproj/project.pbxproj
Basic article controller and delegate
Merge branch 'master' into feature/iphone-first-pass

Conflicts:
	TravelGuide.xcodeproj/project.pbxproj
changed #define to const
include startup view controller in project
Loading works, delegate changes, UI fanciness