readme edited at local
Merge branch 'master' of https://github.com/leoawalker/Study

Conflicts:
	README
local to remote test