Demo
Merge branch 'master' of https://github.com/Jheral/Vyh_Project_Team3

Conflicts:
	Vyh_Project_Team3Project/.idea/gradle.xml
	Vyh_Project_Team3Project/Vyh_Project_Team3/Vyh_Project_Team3.iml
	Vyh_Project_Team3Project/Vyh_Project_Team3/src/main/AndroidManifest.xml