Added bootstrap
Merge branch 'master' of https://github.com/barker1889/HackManc2014