Changes to be committed:
	modified:   screenshot
Merge branch 'master' of github.com:brotatos/scripts

Conflicts:
	screenshot

	modified:   README.rst
	modified:   screenshot