Intial
Merge branch 'master' of github.com:mattleonard/DemoAppForClass