feature A
friday brownie
Merge branch 'hotfix/friday-brownie'
Merge branch 'hotfix/friday-brownie' into develop

Conflicts:
	README.md
v.1.0
Merge branch 'release/1.0'