working game
assembled photo and diagram
Merge remote-tracking branch 'zaza/master'
rearranging things