merged conflicts
merge
Merge branch 'master' of https://github.com/HPGurre/lms.git