setup index css and bootstrap
merge bootstrap fixed conflict in routes
Merge branches 'master' and 'bootstrap' into bootstrap
Merge pull request #2 from StevenHarlow/bootstrap

Bootstrap