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

Conflicts:
	readme.txt