Conflict Resolve
fixed merge error
Fix

Conflicts in 2048.py and Circuit
Fix

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

Conflicts:
	2048.py
	Circuit/electronics.py