Merge branch 'master' of https://github.com/theproshin/Swing

Conflicts:
	README