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

Conflicts:
	youth_law_academy_app/.classpath

youth_law_academy_app/bin/dexedLibs/android-support-v4-93093e246c6a00d6d
ca9a414c813a1e2.jar
	youth_law_academy_app/bin/resources.ap_
	youth_law_academy_app/bin/youth_law_academy_app.apk