Include IntelliJ and output directory.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.gitignore
Merge branch 'dev'
Merge branch 'dev' of github.com:yyfearth/life-stream into dev