my feature
my bad
Merge pull request #1 from soledaddiez/my-feature

my bad
Merge branch 'master' of https://github.com/soledaddiez/gitTrial into develop

Conflicts:
	Trial/src/Trial.java