merge fix:
better media query
font fix
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
heroku working
fixing heroku
merg
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
	app/views/layouts/_header.html.erb
	config/initializers/instagram.rb
basic fixes
sidebar fix
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/controllers/application_controller.rb
	config/environments/development.rb