Commit 3
Commit4 (Version 1)
Commit 5
Revert "Commit 3"

This reverts commit 3fa20855a3bfc6a9624f327813819283f0e7db61.
Revert "Revert "Commit 3""

This reverts commit 2d52bd97afe8e3d5238b2a41f27ad9d5165a94a7.
Commit 12 (Version 1)
Commit 12
Merge branch 'version1'

Conflicts:
	index.php
Commit 15
Commit 16 (rama)
Commit 15
Merge branch 'version1'

Conflicts:
	index.php