bb dont cry
change README for brach a
changed README for master
Merge branch 'branch-a'

Conflicts:
	README