first commit
Merge branch 'master' of github.com:awijnen/blog-app-rails