Routine MacPro
Routine Mac Pro
Routine Imac
Revert "imac_routine"

This reverts commit 76d2253ba2c2d0c2d684d7d5e3c7726ed50f6706.

Conflicts:
	cellsim/viewer.pyc
Revert 76d2253..d792af3

This rolls back to commit 76d2253ba2c2d0c2d684d7d5e3c7726ed50f6706.
Revert Imac
Routine Imac
test
test
test
Merge branch 'master' of https://github.com/shockingpants/GIT

Conflicts:
	cellsim/.viewer.py.swp
test
Merge branch 'master' of https://github.com/shockingpants/GIT
Revert "Imac_Added PGU"

This reverts commit 30bfb01352482c20f119ef40b33d6eff8378e21b.
Commit_Imac New

Manually Edited changes after screw up
Merge branch 'master' into MBA

Conflicts:
	cellsim/viewer.pyc