More typeface stuff. Still in progress, there may be a few glitches, but none that cause anything to crash.
Merged conflicts... commented out my stuff for now in the NoSprayActivity. Will figure out later
Merge branch 'master' of https://github.com/ldanielw1/cs160-mSpray