rework views so code and loading are different
Merge branch 'master' of github.com:RadiusNetworks/scavenger-hunt-ios-os

Conflicts:
	.DS_Store
	scavengerhunt/.DS_Store
	scavengerhunt/ProximityKit.framework/Versions/A/ProximityKit
	scavengerhunt/scavengerhunt.xcodeproj/project.pbxproj
merged chris' version of pk framwork
add a delay before launching main view after loading
Merge branch 'master' of github.com:RadiusNetworks/scavenger-hunt-ios-os

Conflicts:
	scavengerhunt/scavengerhunt.xcodeproj/project.pbxproj