Refactoring app
Merge pull request #15 from kkinnebrew/dev

Refactoring app