initial commit branch dev_1.0
issue3A
issue3B
issue3C
issue2 A
issue2 B
issue2 C
issue1 A
issue1 B
issue1 C
fix conflict
fix conflict2
Merge pull request #1 from charmgranada/dev_1.0

Dev 1.0