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

Conflicts:
	Devin Supertramp/VideosController.swift