Starting with new app setup
Merge branch 'master' of github.com:jamesacklin/avalon-exchange