Merge pull request #1 from Johnidel/master

hey
Merge pull request #1 from Johnidel/master

pull
Merge pull request #3 from bng8/master

Merge pull request #1 from Johnidel/master
Merge pull request #2 from Johnidel/master

pull request 11/13
Merge pull request #2 from Johnidel/master

pull
blah
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main.py
a
Revert "a"

This reverts commit ee50c5ad60591b4730a809ff1bac7375ddbb6350.
changgesss
Merge pull request #4 from cpoudel3/master

rect collison stuff
Merge pull request #3 from Johnidel/master

pull request 2 11/13
collsion fix
Guard added
Removed method

Made this but didn't need it so getting rid of it
Menu Work

NOTE: this menu is verrrrryyy resolution dependent. Once we decide upon
the game window size, I'll change it to work for whatever that is. Let
me know if this is the type of menu you guys want. I tried to make it
fairly dark
Merge pull request #5 from cpoudel3/master

Menu Work
coments
Merge pull request #4 from Johnidel/master

steve 11/17
pathfinding and fixes

Coded up an a* algorithm for guards. Fixed bug with flashlights