also altere b7
Merge branch 'master' of https://github.com/mikekoppano/php-backend

Conflicts:
	b7.txt
winxp mod b7