Merge pull request #2 from marinamarina/devel

Merging the branch devel
Code cleaned up
Code cleaned up
Delete .gitignore~
updated the README file