"idk"
Merge branch 'master' of https://github.com/AbhayVarshney/TimeM-Chrome-Extension-

Conflicts:
	history.js
	mypopup.html
history.js fix