File 2 Changes
Merge remote-tracking branch 'origin/develop' into feature/conflict2

* origin/develop:
  develop commit

Conflicts:
	packages/assignment/public/views/index.html
Merge remote-tracking branch 'origin/feature/conflict2' into feature/conflict1

* origin/feature/conflict2:
  File 2 Changes