Commit 2
Commit 3
Commit 4
Commit 4
Commit 6
Commit 6
Merge remote-tracking branch 'origin/branch2' into branch4

Conflicts:
	app.js
Merge remote-tracking branch 'origin/branch1' into branch4

Conflicts:
	app.js
Merge remote-tracking branch 'origin/branch1' into branch4

Conflicts:
	app.js