moved stuff
Merge branch 'master' of https://github.com/tzookb/TBMsg

Conflicts:
	composer.json
adding messages
moved stuff again