REMINDER: please git pull before making edits!!!!!!

[mo-wright]

Hi gang,

It looks like a bunch of work (including a LOT of encoding and an entire page on the website) went missing when the CSS and Website were most recently updated. Usually a merge conflict will fire to prevent this from happening, but for one reason or another the most recent commit was built off of an outdated version of the repo and overrode a lot of progress. Please don't take this as an attack! This was clearly an honest mistake - I also forget this step a lot, and this is just as much a reminder for me! But please, when you're going to sit down and code for the project, make sure your first step is to open bash and git pull.

[mo-wright]

Also don't worry - It should be a super easy fix, I'll get it resolved ASAP.

[mo-wright]

all fixed! :) excellent work on all the recent commits everyone!!