yeah
Merge https://github.com/morganpatz/proj1

Conflicts:
	WEB-INF/classes/Security.class
Updated UploadImage