Describe Projects
Merge branch 'release/2014062801'
Merge branch 'master' of github.com:hatajoe/gli

is merge is necessary,
Merge branch 'master' of github.com:hatajoe/gli
Merge branch 'issue/6' of github.com:hatajoe/gli into issue/6

Conflicts:
	commands.go