FUCKING XML FILE
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/templates/main.html
Merge remote-tracking branch 'origin/master'
FUCKING XML FILE
FUCKING XML FILE
FUCKING XML FILE
FUCKING XML FILE
FUCKING XML FILE
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/templates/main.html
FUCKING XML FILE