changes 2
Merge branch 'dev1'

Conflicts:
	README
chnages from merged master