pdf conflict
Merge branch 'master' of https://github.com/sirlordrouter/ch.bfh.btx8081.w2013.green.git