merging
Merge branch 'master' of https://github.com/BinaryHeart/EServicesAndWebprograming
first loop of requirements for labbs