Develop

Folded botstrap branch into develop. Now folding develop into master before Heroku push.