added erd
Renamed image.jpg to ERD_diagram.jpg
Merge branch 'develop'

- Turbolinks removed, bcrypt and development/test gems installed
added travis
Merge branch 'develop' of github.com:crywolfe/buggy-bus-app into develop