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

Conflicts:
	Tripify.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate