Merge branch 'dashboardmaster' into electron

author Zhiting Lin <zlin035@uottawa.ca>

Wed, 29 Aug 2018 09:25:12 +0000 (17:25 +0800)

committer Zhiting Lin <zlin035@uottawa.ca>

Wed, 29 Aug 2018 09:25:12 +0000 (17:25 +0800)
author Zhiting Lin <zlin035@uottawa.ca>
Wed, 29 Aug 2018 09:25:12 +0000 (17:25 +0800)
committer Zhiting Lin <zlin035@uottawa.ca>
Wed, 29 Aug 2018 09:25:12 +0000 (17:25 +0800)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Zhiting Lin <zlin035@uottawa.ca>
	Wed, 29 Aug 2018 09:25:12 +0000 (17:25 +0800)
committer	Zhiting Lin <zlin035@uottawa.ca>
	Wed, 29 Aug 2018 09:25:12 +0000 (17:25 +0800)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history