modified makefile
modified ingnore rules
modified ingnore rules
update U using new Niu_c with Em