First commit
Second commit
Revert "Second commit"

This reverts commit ac5b9c316c8fa0378e934dac71e725f0ec438e7e.
Fourth commit
Five commit
Six commit
Modificado manifest 27
Modificado manifest 200
Merge branch 'new-feature'

Conflicts:
	manifest.mf
Arreglado conflicto
Arreglado conflicto
Modificado manifest casi 300
Merge branch 'h' of github.com:sf27/test
COnflicts