working on server junk
a little server work
server
da serva
Merge branch 'master' of http://github.com/whoarethebritons/wifile

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/wifile/NsdActivity.java
I hate everything