Initial Commit
Merge branch 'master' of https://github.com/zwant/ballista

Conflicts:
	.gitignore