Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:lornajane/friday
fixed reame name
setting the scene
added: some singing
Merge branch 'readme-fix' of github.com:mihahribar/friday into mihahribar-readme-fix
Merge branch 'cool-feature' of github.com:janieblue/friday into janieblue-cool-feature
story updated
conflicts resolved