initial import
Merge github.com:ashenwolf/teamwall

Conflicts:
	.gitignore