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

Conflicts:
	ASquare/res/layout/choose.xml
	ASquare/res/layout/row.xml
	ASquare/src/com/example/study_path/MainActivity1.java
	ASquare/src/com/example/study_path/TestAdapter.java
	ASquare/src/com/example/study_path/Utility.java
	ASquare/src/com/example/study_path/data.java
	ASquare_Test/.classpath
	ASquare_Test/.project
	ASquare_Test/AndroidManifest.xml
	ASquare_Test/bin/AndroidManifest.xml
	ASquare_Test/gen/com/example/asquare/test/R.java
	ASquare_Test/hs_err_pid4956.log
	ASquare_Test/res/values/strings.xml
	ASquare_Test/src/com/example/asquare/test/testing.java
	gpa_calculator/res/layout/activity_main.xml
	gpa_calculator/src/com/example/gpa_calculator/MainActivity.java
	gpa_calculator/src/com/example/gpa_calculator/Student.java
	gpa_calculator/src/com/example/gpa_calculator/cgaCalculator.java