Merge branch 'master' of https://github.com/lanmower/gong

Conflicts:
	.gitignore
 Please enter the commit message for your changes. Lines starting
 with '' will be ignored, and an empty message aborts the commit.

 Committer: root <root@50-af-73-65-d0-5a.dummy.porta.siemens.net>

 On branch master
 Your branch is ahead of 'origin/master' by 2 commits.

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   .gitignore

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	.gitignore~