first commit
Merge branch 'master' into spike_sinatra_activerecord