asdfasdf
hjbgkjhb
Merge branch 'master' of https://github.com/faberyx/corsera

Conflicts:
	Testate/Illustrazione_italiana/1932_02_2/3.jpg
	app/config/settings.php
	public/working/21_34_68.jpg
	public/working/21_34_69.jpg
	public/working/thumb/21_34_68.jpg
	public/working/thumb/21_34_69.jpg
Merge branch 'master' of https://github.com/faberyx/corsera

Conflicts:
	Testate/Illustrazione_italiana/1932_02_2/3.jpg
	app/config/settings.php
	public/working/21_34_68.jpg
	public/working/21_34_69.jpg
	public/working/thumb/21_34_68.jpg
	public/working/thumb/21_34_69