Add dev 1
Add dev 2
Add dev 3 from ps2
Add dev 4 from ps1
Merge remote-tracking branch 'origin/dev' into ps1 dev

Conflicts:
	HelloWorld/src/Hello.java
Add constant M
Add dev 5
Merge remote-tracking branch 'origin/dev' into dev
Add dev 6
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	HelloWorld/src/Hello.java
Change M to 1001
Merge remote-tracking branch 'origin/dev' into ps1 dev

Conflicts:
	HelloWorld/src/Hello.java
Delete hello 1-3
Merge remote-tracking branch 'origin/dev' into dev
Add method foo
Merge branch 'dev'