are you committed?
Merge branch 'master' of https://github.com/isaiahyoon/youth_law_academy_app

Conflicts:
	src/com/example/youth_law_academy/MainActivity.java