Deleted unnecessary obj file; moved arrow images
Merge branch 'something'

Conflicts:
	app/controllers/home_controller.rb

Moved files to correct place.