Revert 449d879..d3fda07

This rolls back to commit 449d879995ae21ee539a396c6b13fd7c8546f114.
Added back Main.storyboard

Apparently I messed some things up in the last major commit. Git is
hard...