Initial Commit
Merge branch 'master' of github.com:subshad/bloki

Conflicts:
	.gitignore