Getting ready for heroku
Merge branch 'release/0.0.2'
Modified server
Merge branch 'release/0.0.2'