Added file size extension thing.
Fixed typo.
Merge branch 'master' into infoforcefeed

Conflicts:
	src/merveilles_io/templates/index.html