Cleaned up all of the code and deleting some unnecessary images
Merge branch 'master' of https://github.com/TechTrinkets/techtrinkets

Conflicts:
	build/web/forgotpassword.jsp
	src/java/control/ShoppingControl.java
	web/forgotpassword.jsp