changes in global file formatting
changes in main and ui
Merge branch 'master' of https://github.com/bonhomat/2013-ETP2

Conflicts:
	main.c
	ui.c