Signed-off-by: pacogomezarnal <edutic.es@gmail.com>
Signed-off-by: pacogomezarnal <edutic.es@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitProject/src/GitAdd.java
	GitProject/src/GitProject.java