Title: Daves HUGE Feature 4
Title: David gets Jans HUGE changes and merges it to his own branch
Title: Dave Finished HUGE Feature 4
Merge branch 'davids-huge-feature-4'

Conflicts:
	a.txt
	b.txt
	c.txt
Release v01 made with pride!