Merge branch 'master' of https://github.com/flymke/PG_Test

Conflicts:
	index.html
	js/main.js
updates