hello test
Merge branch 'master' into testing
i hate branches

Conflicts:
	nfcqt.cpp
Merge branch 'testing'
i hate branches so much xD