Auto commit from SOM - 2014-08-28 12:15:01
Futzing with calc.py
Merge branch 'master' of github.com:bnsh/GPU-HW

Conflicts:
	mp2/calc.py