Ass38 almost done
Merge branch 'eug' of https://github.com/Zirzamin/BDSA_2014.git