getting code on imac up to date
Maerge branch 'master' of https://github.com/calvinstudebaker/writetoremember
a
fixed up some view stuff. Can now upload pictures to the server