Initial commit
First Commit
Merge remote-tracking branch 'klb/master'

Conflicts:
	LICENSE
	Makefile
	zshrc