Merge pull request #4 from timabell/master

remove nonfree dependency
Make "screen fit" available to webcams

Just moved the button up out of the slr/webcam toggle section.
Worked straight away. :-)
Ignore qt creator's .user file
Added rotation option
Merge branch 'rotate-image'

* rotate-image:
  Added rotation option