NicolasDaigneault/sal — pull request #1 by RichardLafontaine (2014-01-28 13:23:59+00:00)
Title: Merge of master

Testing the GUI method of merging forks