Merge branch 'master' of https://github.com/allevitan/olinbartering
Merge branch 'master' of https://github.com/allevitan/olinbartering
Merge branch 'master' of heroku.com:olinbartering2
Added 'In development' message
Ensuring consistency with remote repo