still working on the SQL.
here you go
Merge remote-tracking branch 'origin/master'