Corrected typo
Added if statement to only show image <p> if an image was uploaded
Uploaded image
Fixed merge conflict
Fixed merge conflict
Fixed merge conflicts
Merge pull request #17 from LAFcaptstone/ceciliam

Ceciliam
made changes to master page and homepage