Password Upload
Merge branch 'master' of https://github.com/WireTech/trippy

Conflicts:
	display.xcodeproj/project.pbxproj
	display/AppDelegate.m