brianshouse
mergingh 'master' of https://github.com/briank621/OrganizUs

Conflicts:
	organize/db/development.sqlite3
	organize/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	organize/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655