Still debugging...
Merge branch 'master' of https://github.com/ELEC4010B/ExtKey

Conflicts:
	src/ece/course/extkey/ConnectActivity.java