Supposedly fixed keyboard
Merge branch 'master' of http://github.com/meet-projects/aidme-y3-2014

Conflicts:
	main.py
fixed merge