another initial panic commmit
Merge branch 'master' of https://github.com/compa/WebApp