a pycharm test
Merge branch 'master' of https://github.com/wishmerhill/ua100mix

Conflicts:
	main.py
cleaning a bit.
Old fies deleted, other moved.
Added some info in the __init__.py.