fixed typo with image rendering
fixed merge error
Merge branch 'dev' of github.com:stuycs-softdev/proj2-pd7-04-yugo into dev
Merge branch 'dev' of github.com:stuycs-softdev/proj2-pd7-04-yugo into dev
?