Adding files
Adding files
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py
uploading main.py
Merge branch 'master' of https://github.com/delabit/ulauncher