Views
Merge branch 'master' of https://github.com/adwoamary/Earthquakeapp

Conflicts:
	Gemfile.lock