Files from the previous session
Merge branch 'master' of https://github.com/x1o/informatix.git
Merging files from the last session