nonsense
random trying to fix shit
Merge branch 'master' of https://github.com/kwyngarden/CS147-Project
chnged json data and added pictures
added more pictures
Merge branch 'master' of https://github.com/kwyngarden/CS147-Project
Merge branch 'master' of https://github.com/kwyngarden/CS147-Project
added text wrap
fixed conflict
fixed image names