Collobrated commit

what if two people are committing to a branch at the same time
Merge pull request #1 from sixxis/master

Collobrated commit