?
Merge branch 'master' of https://github.com/parthshahva/inquizitive

Conflicts:
	Gemfile.lock