python

s
Merge branch 'master' of https://github.com/ibito/ELauncher

Conflicts:
	application.py
	main.py