2014-12-07 Back-up
Merge branch 'master' of https://github.com/Tomaltach/3rd-Year-Assignment