Adds local import export feature
Merge branch 'master' of https://github.com/SyntaxError2013/Knights-watch

Conflicts:
	popup.html