Removed cached and updated gitignore
Removed Cached Files and Updated .gitignore
Merge branch 'master' into abstraction