Merge branch 'master' into dev
making this project work nicely with eclipse
Merge pull request #2 from ShadowSam/master

Small update to readme and test push from Sam's fork.
Adding bootstrap.css
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx.git into dev
Adding bootstrap to website
Adding in bootstrap-tab.js and adding the tabs for the dashboard feeds.
Merge branch 'master' of https://github.com/ShadowSam/Sphinx