my changes
Merge branch 'master' of https://github.com/mwong56/calpolyrideshare

Conflicts:
	calpolyrideshare/src/com/mwong56/calpolyrideshare/MyPostFragment.java