floatr on the index working
floatr on index working
Merge branch 'development' into index_view

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
index page with oauth login
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss