-=-
Merge branch 'master' of https://github.com/loBsTer-xxx/lobster

Conflicts:
	lion/2/laser