A running app
Merge pull request #6 from smcmurray/dev

Dev
Merge pull request #7 from smcmurray/s34n

S34n