Added Comment

Test comment
Fixing conflicts
Remove conflict header
Merge branch 'master' of https://github.com/Team-One-GGC/D2L-Quiz-Creator