Charm: add branch 3.0
changes to 3.0
Merge branch '_issue_3.0' of https://github.com/charmelle/git_test into _issue_4.0

Conflicts:
	testing.txt