Daily Scrum 29/10/2014
Merge branch 'master' of https://github.com/Suphasin/OOP_Group1