Dodanie do .gitignore *.swp i *~.
Merge branch 'master' of https://github.com/jakubswiatkowski/mathduel

Conflicts:
	.gitignore