add nicktest2
Merge remote-tracking branch 'origin/nick'