Basics
Merge branch 'master' of github.com:wjlroe/ninja-sansa

Conflicts:
	.gitignore
	README.md
Everything