Probably did some stuff
Merge branch 'master' of https://github.com/unixninja92/COMSC-341-Font_Fun

Conflicts:
	app/src/main/java/com/fontmessaging/fontfun/app/MainActivity.java