Merge branch 'bens-cleanup' of github.com:rcoh/SmootLight

Conflicts:
	operationscore/Input.py
	pixelevents/DecayEvent.py
	util/ColorOps.py

1 files changed, 2 insertions, 0 deletions

diff --git a/inputs/PygameInput.py b/inputs/PygameInput.py
index 6779a20..a39c089 100644
--- a/inputs/PygameInput.py
+++ b/inputs/PygameInput.py
@@ -13,6 +13,8 @@ class PygameInput(Input):
                 return
             for event in pygame.event.get():
                 if event.type is KEYDOWN:
+                    if event.key == 301:
+                        exit()
                     self.respond({Strings.LOCATION: (5,5),'Key': event.key})
                 if event.type is MOUSEBUTTONDOWN:
                     self.respond({Strings.LOCATION: pygame.mouse.get_pos()})