add change
Merge branch 'master' of https://github.com/prizrak1609/player

Conflicts:
	main.cpp
	player2.pro
	settings_form.cpp
	settings_form.h
	settings_form.ui
	settings_key.h
	widget.cpp
	widget.h
	widget.ui