Added UDP communication
Merge branch 'master' of
https://github.com/gvangerous/UofAHackathon2014.git

Conflicts:
	Keychain/res/layout/activity_main.xml
	Keychain/src/com/hackathon/keychain/MainActivity.java