basic instagram auth
Merge branch 'master' of github.com:benhorne44/music

Conflicts:
	app/controllers/landing_controller.rb