Still editing some bootstrap stuff
Trying to fix merge conflicts
Merge pull request #12 from olitreadwell/boostrapping

Boostrapping