core2
SAOB
manifest
Merge branch 'master' of https://github.com/teamawa/PorkchopApp

Conflicts:
	PorkChop/AndroidManifest.xml
	PorkChop/src/ph/gov/kabantayngbayan/porkchop/MainActivity.java