Fix #28 add Salamandre and tests

[qsaucy]

28

[wasadigi]

Please split this PR into two, one for each beer. You need to recreate feature branches and use git checkout to retrieve your files (https://stackoverflow.com/questions/2364147/how-to-get-just-one-file-from-another-branch/2364223)