time to start coding unit tests
Merge branch 'master' into sauerbraten