chris makes a change to dev
Merge branch 'dev' of github.com:kingces95/test into dev

Conflicts:
	readme.txt