1. Make it cleaner
2. Reduce the number of imports
Merge branch 'master' of https://github.com/sgkang/GeophysicsToy

Conflicts:
	.gitignore