Initial push
Merge branch 'master' of github.com:aalvarado/zentank

Conflicts:
	.gitignore