Krafs
Merge branch 'master' of https://github.com/calledol/project1_avalg14