hey
Merge branch 'master' of https://github.com/isaiahyoon/youth_law_academy_app

Conflicts:
	res/layout/activity_main.xml