Fixed merge error
Added site to gitignore
Merge branch 'master' of github.com:smithjessk/CapSol