more thanks
Merge branch 'master' of https://github.com/3Pros/juxtapros

Conflicts:
	about.shtml