Adding a basic jsp for image uploading - may make it more fancy later
Resolving merge conflicts