Title: Davids feature 2 part 1
Title: David's feature 2 part 2
Title: David pulls the recent changes from master, merges them appropriately.

Merge branch 'master' into davids-feature-2

Conflicts:
	a.txt
Title: Jan adds to David's feature 2