changed setup of view controllers and constraints and what not
Merge pull request #1 from gregdeterding/master

changed setup of view controllers and constraints and what not