yep
Merge branch 'master' of https://github.com/joulesm/friendly-earthquakes

Conflicts:
	main.py