fixed a bug
Merge branch 'master' of https://github.com/kylejao/ocean_framework

Conflicts:
	mapping/slicing.py
fixed bugs and added run experiments