holy shit
test fix
Merge branch 'master' of
https://github.com/jaredwindover/LoveLetters2.git

Conflicts:
	LoveLettersProject/src/com/koneka/loveletters/ConfirmActivity.java