com
Merge branch 'master' of https://github.com/basvid/sinatra-blog-with-activerecord-tux

Conflicts:
	README.md