-
Merge branch 'master' of https://github.com/mechlabDegenkolbe/lutherprototype

Conflicts:
	face.cpp
New directory structure