merge
merge
merge
merge
Merge branch 'master' of github.com:deereb/competitive_instagram

Conflicts:
	config/initializers/instagram.rb
font colors
polaroid