gistfile1.txt

JoshuaRule-Lappy-4:explorefm jrd02$ git pull origin master
remote: Counting objects: 1153, done.
remote: Compressing objects: 100% (507/507), done.
remote: Total 999 (delta 702), reused 779 (delta 484)
Receiving objects: 100% (999/999), 2.16 MiB | 225 KiB/s, done.
Resolving deltas: 100% (702/702), completed with 106 local objects.
From github.com:kellydunn/explorefm
 * branch            master     -> FETCH_HEAD
Updating 024b827..120bb15
error: The following untracked working tree files would be overwritten by merge:
	app/assets/stylesheets/explorefm.eot
	app/assets/stylesheets/explorefm.svg
	app/assets/stylesheets/explorefm.ttf
	app/assets/stylesheets/explorefm.woff
	chef/cookbooks/explorefm/templates/default/vamp.zip
	config/initializers/delayed_job.rb
	db/migrate/20120115221936_add_echoprint_code_to_tracks.rb
	db/migrate/20120116042352_add_slug_to_users.rb
	db/migrate/20120116042526_add_slug_to_tracks.rb
	db/migrate/20120117062019_add_owner_id_for_all_existing_tracks_remove_rest.rb
	db/migrate/20120117062254_set_slugs_for_sluggables.rb
	db/migrate/20120118024304_create_delayed_jobs.rb
	script/delayed_job
	temp-24716.rdb
Please move or remove them before you can merge.
Aborting