final changes
Merge branch 'master' of https://github.com/deanscameron/Practice

Conflicts:
	practice.txt