First code commit
Merge branch 'master' of github.com:JamesHagerman/WiFiFoFumMapper

Conflicts:
	.gitignore