Instagram and some refactoring
Merge branch 'master' of github.com:codlaug/photofeed

Conflicts:
	Gemfile.lock