local changes added
Merge branch 'master' of github.com:TimelyToga/Test

Conflicts:
	Things.txt