App now has a separate container view
Merge branch 'master' of https://github.com/happywatch/watch-simulator

Conflicts:
	WatchSimulator.xcodeproj/project.pbxproj
	WatchSimulator/AppViewController.swift
	WatchSimulator/Base.lproj/Main.storyboard