gitignore
Merge remote-tracking branch 'origin/master'
JSQLW-24 Remove users and some style modifications