Image upload working
Merge branch 'master' of https://github.com/g-chag/CMPUT301F14T01-Team1Project