Merge branch 'dev' of github.com:drowzyorginal/ETS170-GROUP-E into dev
Marked already existing requirements