add beer-song exercise
Merge remote-tracking branch 'origin/beer-song'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Add trinary exercise
Merge pull request #19 from bistik/trinary

trinary
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'