2

changes from feature-idea branche.
feature-idea

3
Merge branch 'feature-idea'

Conflicts:
	README.md