adding simple test to see if it works
Merge remote-tracking branch 'origin/master'