Meeting 21-10-2014
Merge branch 'master' of https://github.com/teeosx/oopgroup15