Added laus0006
Merge branch 'master' of github.com:laus0006/2014SE3