Ignore nohup.out
Merge branch 'master' into test