Changed .gitignore
Removed project backup
Merge branch 'master' into testing