Update
Merge branch 'master' of https://github.com/muit/Ironhack-Trivia

Conflicts:
	Gemfile.lock