finished excercise
Merge branch 'master' of https://github.com/jamaga/Lexi