commit manifest (moved a class to diff. package)
updated gitignore and OfficesActivity
Merge branch 'master' of https://github.com/uiijo/blue-rideshare

Conflicts:
	.gitignore