Changed the layout of main activity to look a bit nicer, and fixed sign 
up problem.
fixed merge error in PatientActivity
Merge branch 'master' of https://github.com/tianyupu/MediTrack