pre lily
Merge branch 'master' of https://github.com/alexandrayorke/FinalCS147Project
before pulling size changes
fix conflicts
resolved conflicts
office hours changes to hammer.js, meta tags
resolved convlicts