Conflict Resolve
fixed merge error
Fixed Color Scheme
Made Circuit Blue, added debug info

-Press M to show movements made last turn
-removed unused variables and code
-changed circuit to blue base color
-started properly tracking number movements
Implemented diagonal paths on Circuit
Port to Python 2.7

-imported python 3 features where needed
-removed use of pygame vectors and replaced with my own old vector class
optimization
Fix

Conflicts in 2048.py and Circuit
Graphics change and test removal
Merge remote-tracking branch 'origin/GraphicsGeneration'
Fix

Conflicts in 2048.py and Circuit
Merge
Merge branch 'master' of https://github.com/Marco-Meyer/TINF13AIBI-Kinect

Conflicts:
	2048.py
	Circuit/electronics.py