merging in changes saved to gh-pages
fixed image
resolved merge conflicts
reduce to one model and wrote code to construct url for api endpoint
merging amy into master
merging master