Merge pull request #23 from nairys/styling

Styling
Update README.md
conflicts resolved and more refactoring
Merge pull request #24 from nairys/statistics

conflicts resolved and more refactoring
changed style
Merge branch 'master' into styling
styling changes