initial
Merge branch 'master' of github.com:snasir/beats_ls

Conflicts:
	.gitignore