application setup
Merge pull request #1 from karengreene/master

application setup