Base code
Merge https://github.com/isaiahgarza/CompVis-Spring13
Update to resolution.py
Small test
Merge branch 'master' of https://github.com/isaiahgarza/CompVis-Spring13
removed some files