way rich
del way rich
merge"
del way rich
Merge branch 'dev'

Conflicts:
	readme.txt
new branch
&
solve conflict
way happy
ok
way happy
del happy
wants clear
ok!
del ok
no ff
del