first commit
Merge branch 'master' of https://github.com/vanWezel/cordova-beacon

Conflicts:
	README.md
Added a file