Merge pull request #7 from seanwolter/master

maybe fixed merge errors or maybe broke everything
Merge pull request #8 from seanwolter/master

rolled back storyboard
Merge pull request #9 from seanwolter/master

so sorry.
Merge pull request #11 from seanwolter/master

merge from jerherrero