2
Merge branch 'bugfix2.18' of github.com:addemar/HelloGit into bugfix2.18

Conflicts:
	thebugfix