Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:lornajane/friday
fixed reame name
setting the scene
Almost the same as before.
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
Adds new feature with two new files.
Updates the feature.
Merge branch 'SamoB25-feature-samo'

* SamoB25-feature-samo:
  Updates the feature.
  Adds new feature with two new files.
Merge branch 'master' of github.com:stepicm/friday into stepicm-master