Clean up
Merge branch 'master' of https://github.com/sdgandhi/Abacus

Conflicts:
	Abacus/ViewController.h
	Abacus/ViewController.m