stu's china+germany changes
milan's changes
rm pdf
pdf conflict
Merge branch 'master' of https://github.com/thugsb/350brief