Fixed comment stuff
Merge branch 'master' of https://github.com/briank621/OrganizUS

Conflicts:
	organize/db/development.sqlite3
	organize/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	organize/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	organize/tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	organize/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	organize/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	organize/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655