init project
Merge branch 'master' of https://github.com/miguelgallegos/4lss

Conflicts:
	README.md
untracked files added