pull master
Merge branch 'master' of https://github.com/kelto/software-project into daniel

Conflicts:
	README.md
added test file
another test
last test
Merge branch 'daniel' of https://github.com/kelto/software-project into daniel

Conflicts:
	README.md
	java/form/Form.java
	java/servlet/CreateUserServlet.java
	java/servlet/ListProductServlet.java
	java/servlet/ListUserServlet.java
Merge branch 'daniel' of https://github.com/kelto/software-project into daniel

Conflicts:
	java/entity/Basket.java
	java/entity/BasketProduct.java
	java/entity/Bill.java
	java/entity/Brand.java
	java/entity/Command.java
	java/entity/CommandProductPK.java
	java/entity/Comment.java
	java/entity/Product.java
	java/entity/Tag.java
	java/entity/User.java
Merge branch 'daniel' of https://github.com/kelto/software-project into daniel