testing out the fetch/merge with a personal commit in between.
Merge remote-tracking branch 'origin/master'
Test to see how conflicts are handled.
Conflicts:
	things-to-learn.md
Putting the things-to-learn file back to the same state as
the origin file, to see if it will say I'm up to date or not.
Merge branch 'master' of https://github.com/jiffyclub/lbl-things-to-learn
Merge branch 'master' of https://github.com/jiffyclub/lbl-things-to-learn
Adding things to learn from group 27
Merge pull request #1 from jiffyclub/group27

Added new things to learn from group 27