ok
Merge branch 'master' of https://github.com/pangers/tinyTony

Conflicts:
	.gitignore