cleaning the code
Merge branch 'master' into is32
Merge branch 'master' of https://github.com/LampTFG/Project1

Conflicts:
	src/com/example/project01/ProductShow.java
Merge pull request #36 from LampTFG/is32

cleaning the code