updates main and animals
merge,basic files before testing