dont talk about forking yet
Merge branch 'master' into answers
add sinatra reloader
Merge branch 'master' into answers