graphics changes
Solving Conflicts
Merge remote-tracking branch 'origin/master' into felix
Added function to display kinect warning
Merge remote-tracking branch 'origin/master'

Conflicts:
	2048.py