Compilation
Recompilation.Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear

Conflicts:
	data/level/forest-1.cl
Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear
Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear

Conflicts:
	data/level/forest-1.cl
Recompilation
Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear

Conflicts:
	data/level/forest-1.cl
Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear
Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear
Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear
Merge branch 'master' of ssh://dev.stuff-o-matic.com:4022/~git/plee-the-bear

Conflicts:
	data/level/forest-1.cl
Compilation
Merge branch 'master' of github.com:j-jorge/plee-the-bear

Conflicts:
	data/level/forest-1.cl
recompilation