Merge pull request #1 from thunderdomes/alpha-1

Alpha 1
precompile assets
Merge branch 'master' of github.com:thunderdomes/triptrap

Conflicts:
	Tripify.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
precompile assets
Merge branch 'alpha-1'

Conflicts:
	Tripify.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' into alpha-1

Conflicts:
	Tripify.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
update instance ID method
update instance id