More polish, organized files a bit
Tweak
Merge branch 'master' of github.com:Zolmeister/prism

Conflicts:
	js/main.js