minimal version
Merge branch 'master' of github.com:wtbhk/Tower_test

Conflicts:
	.gitignore

gitignore