what we did in class

+Color XML
+Start login
Merge branch 'master' of https://github.com/YurishoSan/java5775_5366_9373

Conflicts:
	bin/R.txt
	bin/classes/.gitignore
	bin/classes/entities/Allergy.class
	bin/classes/entities/Doctor.class
	bin/classes/entities/Human.class
	bin/classes/entities/Medicine.class
	bin/classes/entities/MedicineAllergy.class
	bin/classes/entities/Password.class
	bin/classes/entities/Patient.class
	bin/classes/entities/PatientAllergy.class
	bin/classes/entities/Prescription.class
	bin/classes/entities/Treatment.class
	bin/classes/enums/Permit.class
	bin/dexedLibs/appcompat_v7-de8a309204fc37bbd60edc6bebbbb5c7.jar
	bin/java5775_5366_9373.apk
	bin/resources.ap_
	res/layout/activity_main.xml
	res/values/strings.xml
fix marge
Remove Human

-Remove Human class
*Change Patient and Doctor classes to not extend human, and instead
implement it's attributes inside themselves

*update Javadoc