sleep is for the weak
Merge branch 'master' of http://github.com/whoarethebritons/wifile

Conflicts:
	app/src/main/java/com/example/wifile/NsdActivity.java

"sleep is for the week"
da demo cooode
Merge branch 'master' of http://github.com/whoarethebritons/wifile