Update README.md
Added errbit-Link
Merge branch 'Elch'
Merge branch 'Elch'
Merge branch 'Elch'
update db.schema
changed the travis.yml, so rake db:migrate is called before bundle exec rake is called
Merge remote-tracking branch 'origin/master'
merged master in Elch
implemented feature #46
Merge branch 'Elch' into E/feature/#100

Conflicts:
	db/schema.rb