first commit... or commit1
Merge branch 'master' of http://github.com/DianaEne/shared