added bootstrap
moved app.css to app.css.sass

also added twitter bootstrap
added basic bootstrap layout
Adding a json api to pictures#index
Merge branch 'api' into develop
updated index.html.erb
Merge branch 'feature/bootstrap' into develop
Merge branch 'develop' of github.com:daegren/photogur into develop
Adding devise for auth and adding a user model.
Merge branch 'feature/login' into develop

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/views/layouts/application.html.erb
Fixing login/logout buttons

Also removing extra notice area on index.html.erb
And cleaning up css to remove redundant class
Merge branch 'release/v1'