load jquery before bootstrap
Merge branch 'master' of github.com:portlandcodeschool/JS2013F-assignment7

trying to merge
Refactor View