finished rough skeleton for landing splash page
sync
got some more added for work page, nearly set up
Merge remote-tracking branch 'origin/jeff' into wes
sync
fixed merge conflict
added functionality for work. will move on to something else now
Merge remote-tracking branch 'origin/wes' into tal
slight tweaks
Merge remote-tracking branch 'origin/tal' into wes
added new html files
made the layout a little more responsive
more tweaks
working on people page
people page
Merge remote-tracking branch 'origin/wes' into tal
sync
adding stuff to culture
Merge remote-tracking branch 'origin/wes' into tal
 resolved conflict