Changing images + styling
Merge branch 'master' of github.com:Oxynum/mysquash

Conflicts:
	app/assets/stylesheets/tournaments.css.scss
	app/views/layouts/inscriptions.html.haml