Fixed merge errors
Merge branch 'Rob' of https://github.com/johnmolly92/LetterChecker into Rob

Conflicts:
	LetterChecker/bin/LetterChecker.apk
	LetterChecker/bin/classes.dex
	LetterChecker/bin/classes/com/example/letterchecker/Square.class
	LetterChecker/bin/classes/com/example/letterchecker/Triangle.class
	LetterChecker/bin/resources.ap_