Added server
Merge branch 'master' of github.com:Stormion/NFC-Locator-Server

Conflicts:
	.gitignore