FIxes merge conflict. -____-
Merge branch 'master' of github.com:OrganicHackers/The-List

Conflicts:
	Gemfile.lock