Merge branch 'dev1', remote-tracking branch 'origin/master'
 pusing the merged changes back to origin on remote
Merge branch 'dev1'

Conflicts:
	README
chnages from merged master
local change commited into dev1
Merge branch 'master' into dev1