Merge branch 'dev'
Add ROOT.war as necessary for the lecture
Cleanup
Added document for next sprint
sprint_05_planning
Revert "sprint_05_planning"

This reverts commit b4d08f3a2a900c0607a5c4750a60d9e7313f29ad.
sprint_05_planning
Merge branch 'dev' of https://github.com/t-animal/DocMatic
sprint_05_release
sprint_06_planning document
Merge branch 'master' of https://github.com/t-animal/DocMatic
Merge branch 'dev'
Release sprint 06
Sprint 7 planning document
Merge branch 'master' of https://github.com/t-animal/DocMatic
Sprint 07 planning document
Merge branch 'dev'
Sprint 07 Release
sprint_08_planning document
Merge branch 'dev'