initial commit
Merge https://github.com/f4nky/ch.bfh.smojeWeb