added winshot functionality into screenshot
merge of screenshot and winshot
Merge branch 'master'

Conflicts:
	screenshot