commit on leckie
commit on dev
Merge branch 'leckie' into dev

Conflicts:
	readme.txt