first commit
Merge branch 'master' of github.com:j796160836/GlassBeacon

Conflicts:
	.gitignore