Merge branch 'gh-pages'
Added navbar with colour
Made buttons bigger
Merge branch 'master' into gh-pages