updated git ignore
update gitignore
merge develop with master