logintest
Merge branch 'master' of https://github.com/chrislol/A_square.git

Conflicts:
	ASquare_Test/src/com/example/gpa_calculator/test/MainActivityTest.java