dfsdf
vfgMerge branch 'master' of https://github.com/briank621/OrganizUs

Conflicts:
	organize/log/development.log
	organize/tmp/cache/assets/development/sprockets/059e5e479a857e76affbf0c405e4f769
	organize/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	organize/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	organize/tmp/cache/assets/development/sprockets/3b6dcd003fc0345f0451081fc42b30fa
	organize/tmp/cache/assets/development/sprockets/3ea5bb256ff6a9f28ef3d19f7d1273ae
	organize/tmp/cache/assets/development/sprockets/69b44f0dde0911b44be4e23a612de927
	organize/tmp/cache/assets/development/sprockets/7aed07cd9be2e9410e01667af8177264
	organize/tmp/cache/assets/development/sprockets/88224f26c865999a021178a7e049b026
	organize/tmp/cache/assets/development/sprockets/9527d6c0ff83e08eb455eee782454eb8
	organize/tmp/cache/assets/development/sprockets/9851e5a9ebb7f1825512796666196b9b
	organize/tmp/cache/assets/development/sprockets/b268081c45ac968ff92511180c74ad0e
	organize/tmp/cache/assets/development/sprockets/bef62ca9e94ae91e3e1287c1b9a2e86c
	organize/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	organize/tmp/cache/assets/development/sprockets/d0f5e8d8a2b644f9d7e25eb746857689
	organize/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	organize/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	organize/tmp/cache/assets/development/sprockets/f925bbaa6d6a4ce22ba1f3fb2e416561
 https://github.com/briank621/OrganizUs

Conflicts:
	organize/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	organize/tmp/cache/assets/development/sprockets/280e1ab04f64cfa2cb7b6935ff4125df
	organize/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	organize/tmp/cache/assets/development/sprockets/3b6dcd003fc0345f0451081fc42b30fa
	organize/tmp/cache/assets/development/sprockets/66049f171ebbd51a52a87e49cd14a5d4
	organize/tmp/cache/assets/development/sprockets/665e3c6c09ff1386e81473b096af14a5
	organize/tmp/cache/assets/development/sprockets/685f0f61426b98eae00e3fbb55ccfc42
	organize/tmp/cache/assets/development/sprockets/69b44f0dde0911b44be4e23a612de927
	organize/tmp/cache/assets/development/sprockets/720bcc5d815c0eb71fabd37c1c64d70b
	organize/tmp/cache/assets/development/sprockets/88224f26c865999a021178a7e049b026
	organize/tmp/cache/assets/development/sprockets/9190dfbd39d7b521c55d80c2805362a7
	organize/tmp/cache/assets/development/sprockets/9851e5a9ebb7f1825512796666196b9b
	organize/tmp/cache/assets/development/sprockets/a2200720e330965509460d82fe403934
	organize/tmp/cache/assets/development/sprockets/b268081c45ac968ff92511180c74ad0e
	organize/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	organize/tmp/cache/assets/development/sprockets/d0f5e8d8a2b644f9d7e25eb746857689
	organize/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	organize/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	organize/tmp/cache/assets/development/sprockets/f925bbaa6d6a4ce22ba1f3fb2e416561
boobs