reformat
gitignore
Merge branch 'master' of github.com:mikebocian/JiraWorklogAggregator

Conflicts:
	background.js
	popup.js