update with wiki
Merge branch 'master' of https://github.com/CoHyper/ui_elements

Conflicts:
	README.md