Avance
Merge branch 'master' of github.com:degyves/clipos

asdf

Conflicts:
	Makefile