rename makefile to Makefile
Merge remote-tracking branch 'local/master'

Conflicts:
	Makefile
Revert "install icon"

This reverts commit d44e54f08c2baad00a4f36e25a5db2abfab93bfb.

Conflicts:
	Makefile
	ui.c
solve conflict:)