updte
Merge branch 'master' of https://github.com/thunderdomes/Trololol

Conflicts:
	.gitignore
commit