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
merge fix:
better media query
added delete gallery button and functionality
added seamless background image
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
font fix
Added delete image feature
Merge branch 'feature/delete-galleries' into development
Merge branch 'master' of github.com:deereb/competitive_instagram
form fix
Merge branch 'development'
heroku test'
heroku test
Merge branch 'development'
Merge branch 'development' of github.com:deereb/competitive_instagram

Conflicts:
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb
heroku push