Make some overall changes
Fixed the conflicts in the merge
Merge pull request #28 from berkompasacademy/make_some_overall_changes

Make some overall changes