Changed gitignore
Merge branch 'develop'
Re-inserted windows.py
Merge branch 'master' of https://github.com/TaskEvolution/Task-Coach-Evolution
Removed .py references from .gitignore