updated titles, began shit.html easter egg
resolved merge conflict
cleaned up language