3 commits

Author	SHA1	Message	Date
Jakob Schrettenbrunner	20472a903c	merge remote changes	2018-06-03 18:31:43 +02:00
Dane Everitt	0bf4764bfb	Add navigation to the server view	2018-06-02 23:36:20 -07:00
Jakob Schrettenbrunner	89f47c6dbb	mocked server page and better navigation and overall layout	2018-05-28 00:37:03 +02:00