skeleton for website
Merge branch 'master' of https://github.com/nrubin/ElecanismsFinalProject
Merge branch 'master' of https://github.com/nrubin/ElecanismsFinalProject
Merge branch 'master' of https://github.com/nrubin/ElecanismsFinalProject
fixed merge conflicts
Merge branch 'gh-pages' of https://github.com/nrubin/ElectriciTree into gh-pages