josh's first edit it master branch
josh's second edit in master branch
josh keeps making changes to master
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	readme.txt
Merge branch 'dev' of github.com:kingces95/test into dev