los
Merge branch 'master' of https://github.com/ngochien/pr2.git

Conflicts:
	pr2/bin/a01/WebShop.class
Added comments