updating ignore file
updating more things to ignore file
merging latest master