updated part 1
Merge branch 'master' of https://github.com/anthony-ng/singing-with-sinatra