Added gpa
Added lives
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	HelloAndroid/src/com/example/helloandroid/Person.java