fun1
Merge branch 'fun1'

Conflicts:
	README