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

my bad
no message
no message
Merge branch 'feature/tryingtodeletethisrepoagain' of https://github.com/soledaddiez/gitTrial into feature/tryingtodeletethisrepoagain
Merge pull request #8 from soledaddiez/feature/tryingtodeletethisrepoagain

Feature/tryingtodeletethisrepoagain
Ahaha...I want to delete this repo!!
Merge branch 'master' of https://github.com/soledaddiez/gitTrial into develop

Conflicts:
	Trial/src/Trial.java