updated source with basic ui
remove to merge with work
commit for merge actual source from work branch
Merge branch 'work'

Conflicts:
	Makefile
	src/main.c