small test
Merge branch 'master' of github.com:tkowark/hpi-hiwi-portal