Added unsaved matlab files to gitignore
Updated analysis
fixed merging issure