prettify add
Merge branch 'master' of https://github.com/interacthings/webmagazinco

Conflicts:
	forum.php