Merge branch 'master' of github.com:jflasher/drone-browser

Conflicts:
	.gitignore
Merge branch 'master' of github.com:jflasher/drone-browser