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

Conflicts:
	.gitignore
Merge pull request #1 from Stormion/master

Master