Added image source
Added image, email and location forms
Fixed path to css file
Added static method to upload image
Save image path in db if image was uploaded
Fixed merge conflict
Made changes to various files
fixed master layout merge error
Merge pull request #14 from LAFcaptstone/ceciliam

Ceciliam