init.
Merge branch 'master' of https://github.com/goffity/NFCDemoAndroid

Conflicts:
	.gitignore