added logo image and adding jinja blocks for inheritance
Merge branch 'master' of github.com:stuycs-softdev/proj1-7