bits'n'bobs
some unit tests
Merge branch 'master' of https://github.com/ShaneGH/BackToFront

Conflicts:
	Roadmap.txt

Conflicts:
	Roadmap.txt

conflicts in roadmap