so I just lost a ton of progress. So from now on Im committing all the time
Merge branch 'gh-pages' of github.com:StuySciOly/announcements into gh-pages