commit
Merge branch 'master' of https://github.com/abacaj1/tony

Conflicts:
	.deployment