Added .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	joystick-qt.pro.user