static website
prezi
Merge remote-tracking branch 'upstream/master' into 310

merge
#310 Added encoding