ignore stuff
merge test
removing unneccessary files