x
Merge branch 'master' of https://github.com/rojiani/Earthquake-Notification-System

Conflicts:
	README.md