Auto sizing option
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/stylesheets/anidex.css