Commit after failed rollback

Test
Merge branch 'master' of https://github.com/V-Roger/Samotraces-Trans_Mute

Conflicts:
	contact.html
	home.html
Merge branch 'master' of https://github.com/V-Roger/Samotraces-Trans_Mute

Conflicts:
	transmute.html