added bootstrap js in app assets. stylesheets/css are in vendor assets.
Merge branch 'master' into bootstrap

Pulling updated master into bootstrap branch.
Merge pull request #5 from alycit/bootstrap

Bootstrap