Interfaz De Usuario
Interfaz de usuario
Merge branch 'develop' of https://github.com/maxjbv/kivy-CM-2014 into develop

# By Felipe Vieira da Cunha Serafim
# Via Felipe Vieira da Cunha Serafim
* 'develop' of https://github.com/maxjbv/kivy-CM-2014:
  no message

Conflicts:
	main.py