commit 11
Merge branch 'master' of https://github.com/stbyrne/pfai-beta1

Conflicts:
	www/css/index.css
	www/js/index.js