new commit
Merge branch 'master' of https://github.com/mikewirig/Super-Tramp

Conflicts:
	Devin Supertramp.xcodeproj/project.xcworkspace/xcshareddata/Devin
Supertramp.xccheckout