Pre-final version
Merge branch 'add_words_func' of https://github.com/fomalhaut95/Lab1 into add_words_func