take out stuff not needed
Merge remote-tracking branch 'origin/master'
gfh