testing git stage/commit/push
Merge branch 'master' of https://github.com/danielvdotcom/sinatra