stuff on bootstrap etc
Merge branch 'master' of https://github.com/cs147win2014/project

# By Isabelle Woodrow
# Via Isabelle Woodrow
* 'master' of https://github.com/cs147win2014/project:
  fixing