SwipSwap funktioniert :)
Merge branch 'master' of https://github.com/MartinKolb1987/mp

Conflicts:
	client/js/main.js