added users controller
added bower/angular-ui gem
added movies controller
Merge pull request #1 from meidlin/add_gems

added bower/angular-ui gem
Merge pull request #2 from meidlin/moviescontroller

Moviescontroller
added bootstrap gem
added bootstrap gem
Merge pull request #3 from meidlin/styling

added bootstrap gem, merging now
add require angular/angular-ui-router
deleted bootstrap gem
deleted bootstrap from gemfile
app.js file modified
Update Gemfile.lock
???
fixed gemfile.lock
Merge pull request #4 from meidlin/appjs

Appjs
added stuff
fixed conflict