Routes
Merge branch 'master' of https://github.com/dice89/wikipediawars

Conflicts:
	dump.rdb