updated pm site omg
Fix the Christmas bug
Merge branch '2.0' of github.com:eumlab/website into 2.0