Added switch to Eclipse/Sublime
Added non_media_backup to directories
recommit after conflict then pull