.
Merge pull request #6 from traviscole/master

Merging App and master before 04/04 meeting
Merge pull request #7 from traviscole/App

App to master merge