removed some debug stuff from this branch
dfsdfkh
mother fucker
Merge branch 'master' into testing
i hate branches

Conflicts:
	nfcqt.cpp