Fixed Navbar so highlights 'Calendar' on calendar page
Unknown changes
Merge branch 'master' of https://github.com/Lamikins/desTROYers

Conflicts:
	index.html