commit in development
commit in master
Merge branch 'development'

Conflicts:
	README.md