first commit (v2.6)
Merge branch 'master' of https://github.com/Tanisca/thelaststick

Conflicts:
	.gitignore