Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app/app.module.ts

src/app/components/header/header.component.html

@@ -4,6 +4,7 @@
 		<div id="menu-desktop">
 			<div (click)="navigate('/')">Home</div>
 			<div (click)="navigate('/gamenight')">Game night</div>
+			<div (click)="navigate('match-history')">Match History</div>
 			<div (click)="navigate('/stats')">Stats</div>
 		</div>
 		<div id="menu-mobile">
@@ -11,6 +12,7 @@
 			<div id="menu-mobile-dropdown-content">
 				<div (click)="navigate('/')">Home</div>
 				<div (click)="navigate('/gamenight')">Game night</div>
+				<div (click)="navigate('match-history')">Match History</div>
 				<div (click)="navigate('/stats')">Stats</div>
 			</div>