failure
Whats up
Merge branch 'master' of https://github.com/KaBKa/WriteTowers
Merge branch 'master' of https://github.com/KaBKa/WriteTowers

Conflicts:
	test1