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