update gitignore
removed unessesary files
merge master into development