first few line of code - empty window
Merge remote-tracking branch 'origin/master'