adding very little else. going to talk to bill about best way to do html stuff
Merge branch 'master' of https://github.com/billdriscoll22/108project
conflict resonvled