restructured files
Merge branch 'master' of https://github.com/skeie/PT

Conflicts:
	public/script.js