Merge branch 'school' of http://github.com/alwintje/test
ADDED HOWTO
Merge branch 'master' into school