pushing
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/assets/javascripts/application.js