ignore
no message
no message
Merge branch 'branch_mon'
change load image
Merge branch 'branch_kevin'
SAOB SARO
ignore
Merge branch 'branch_josh'

Conflicts:
	PorkChop/AndroidManifest.xml
	PorkChop/res/layout/activity_saro_details.xml
	PorkChop/src/ph/gov/kabantayngbayan/porkchop/MainActivity.java
add resized budget slide images
Add about us activity
Merge branch 'master' of https://github.com/teamawa/PorkchopApp

Conflicts:
	PorkChop/AndroidManifest.xml
	PorkChop/res/layout/activity_saro_list_agency.xml
	PorkChop/res/layout/activity_saro_region.xml
	PorkChop/res/layout/activity_saro_sector.xml
	PorkChop/src/ph/gov/kabantayngbayan/porkchop/MainActivity.java
Merge branch 'master' of https://github.com/teamawa/PorkchopApp
fix manifest and about activity
Merge branch 'branch_rodel'

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