yfufyuvuviv
Merge branch 'Rob' of https://github.com/johnmolly92/LetterChecker into Rob

Conflicts:
	LetterChecker/AndroidManifest.xml
	LetterChecker/bin/AndroidManifest.xml
	LetterChecker/bin/LetterChecker.apk
	LetterChecker/bin/classes.dex
	LetterChecker/bin/classes/com/example/letterchecker/Lesson.class
	LetterChecker/bin/classes/com/example/letterchecker/R$id.class
	LetterChecker/bin/classes/com/example/letterchecker/R$layout.class
	LetterChecker/bin/classes/com/example/letterchecker/R$menu.class
	LetterChecker/bin/classes/com/example/letterchecker/R$string.class
	LetterChecker/bin/classes/com/example/letterchecker/R$style.class
	LetterChecker/bin/classes/com/example/letterchecker/Start.class

LetterChecker/bin/classes/com/example/letterchecker/StudentLoggedIn.clas
s

LetterChecker/bin/classes/com/example/letterchecker/StudentLogin$1.class
	LetterChecker/bin/classes/com/example/letterchecker/StudentLogin.class

LetterChecker/bin/classes/com/example/letterchecker/TeacherLoggedIn.clas
s

LetterChecker/bin/classes/com/example/letterchecker/TeacherLogin$1.class
	LetterChecker/bin/classes/com/example/letterchecker/TeacherLogin.class
	LetterChecker/bin/classes/com/example/letterchecker/ViewStudents.class
	LetterChecker/bin/resources.ap_
	LetterChecker/gen/com/example/letterchecker/R.java
	LetterChecker/res/values/strings.xml
afafafafa