Prime Factorization+animation improvements
Merge branch 'master' of https://github.com/alexhughesking/MathSnap

Conflicts:
	src/uf/seniorproj/alexryan/MainActivity.java