refactored and cleaned up code
Merge branch 'master' of https://github.com/dp6ai/instagain

Conflicts:
	Gemfile.lock
	lib/photo.rb
removed old acceptance_helper.rb