Merge branch 'Macpro'
Merge branch 'Macpro'
Merge branch 'Macpro'
Imac Routine
Merge branch 'master' of https://github.com/shockingpants/GIT

Conflicts:
	cellsim/main.pyc
	cellsim/viewer.py
	cellsim/viewer.pyc
Merge branch 'master' into Macpro
Routine Mac Pro