added table environment, changed spacing
make it a table
Merge origin/master into current branch master