AC done
Merge branch 'master' of https://github.com/champo/embebidos-2014C1

Conflicts:
	module-ac/firmware/main.c