Main page

Personal info passed from main page
Merge branch 'Dev' of https://github.com/DerekJonesCanada/LoveLetters into Dev

Conflicts:
	LoveLettersProject/.classpath
	LoveLettersProject/res/layout/activity_main.xml
	LoveLettersProject/res/values/strings.xml
	LoveLettersProject/src/com/koneka/loveletters/MainActivity.java
wtf

what is this