CVJ-12: Added .gitignore. Also fixed minor bug in controller.py