add .gitigore & nouse.properties
Merge remote-tracking branch 'origin/master'