asdf
Merge pull request #31 from stuycs-softdev/Timothy

asdf
fixed footer
Merge branch 'Simon' of https://github.com/stuycs-softdev/proj3-6-JJTS into Simon