To discard
Merge branch 'master' of https://github.com/PPedroso/PDM_G14

Conflicts:
	src/com/example/pdm_serie1/AssignmentActivity.java
	src/com/example/pdm_serie1/MainActivity.java
	src/com/example/pdm_serie1/SemesterClassesActivity.java