removing d3 trademe subfolder
Merge branch 'master' of https://github.com/Jui244/emedart

Conflicts:
	.DS_Store
	db/migrate/20130831042143_create_categories.rb
	db/schema.rb
	log/development.log
	tmp/cache/assets/development/sprockets/051c10769cce7b15a33fe01f8b645707
	tmp/cache/assets/development/sprockets/07f1a4d734136a6fcf634b88c744c0fb
	tmp/cache/assets/development/sprockets/0d2d7ce47f62349205069f6e1aaeb8bb
	tmp/cache/assets/development/sprockets/16bc738a4c404cf7055052160fae4703
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/76b65e129a174119d098f5b7f70c3d7f
	tmp/cache/assets/development/sprockets/790efa547c6011abc72fbedaf1ce7b13
	tmp/cache/assets/development/sprockets/815c76ba01c386ba24a861f8b2222ced
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f0cfdb7a54daa6ab4fac755a684c0880
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/fcc79aaf6276a994d445f6ecdd6c26f4
	tmp/pids/server.pid