Merge branch 'master' of github.com:psheiman/Lango

Conflicts:
	.gitignore
	README.md