small refactor
autcomplete
Merge branch 'master' of https://github.com/ewelaryba/along_way_project into newe_dev