initial commit
clean and reorganize
add icons
solved merge conflict