commit as non colaborator
Merge remote-tracking branch 'upstream/master'
merge commit
Merge remote-tracking branch 'upstream/master'
Merge pull request #35 from fortegente/master

Pull request