conflict...
Merge branch 'master' of github.com:Theo13/damncute

Conflicts:
	Actions/ActFocus.hh
Merge branch 'master' of github.com:Theo13/damncute
begining of implementation of layers
Merge branch 'master' of github.com:Theo13/damncute
Merge branch 'master' of github.com:Theo13/damncute
some change in matrix origin