added some test text for git pull
Import from upstream
Updates
Code formatting and JSON maps
Merge pull request #61 from dreamteam69/master

Code formatting and JSON maps
Remove hairline from underneath navbar

OCD is no longer affected
Merge pull request #62 from dreamteam69/master

Remove hairline from underneath navbar
Footer
Merge pull request #63 from dreamteam69/master

Footer
Improve footer
Merge pull request #64 from dreamteam69/master

Improve footer
Revert "Improve footer"

This reverts commit f18c2619de9da8b3152c4c014fcc25298bed9a8e.
Merge pull request #65 from dreamteam69/master

Revert "Improve footer"
Spice up the homepage
Merge pull request #66 from dreamteam69/master

Spice up the homepage
Tidy up some elements
Merge pull request #67 from dreamteam69/master

Tidy up some elements
Horizontal divider
Actually tidy up the right thing this time
Merge pull request #68 from dreamteam69/master

Actually tidy up the right thing this time