tables are bootstrappified, small changes to navigation bar
fixed merge conflict
Merge pull request #14 from deliaz1993/master

tables are bootstrappified, small changes to navigation bar