Update README.md
msg
Merge https://github.com/cnd11/CoE1186

Conflicts:
	README.md
hi
Environment Added
environment
Merge pull request #1 from tnason/master

Environment
environment
env
msg
Merge pull request #2 from tnason/master

Environment
new
Update README.md
layout change
Merge branch 'master' of https://github.com/tnason/CoE1186

Conflicts:
	prototypes/Environment/Environment.java
	prototypes/Environment/Message.java
	prototypes/Environment/Worker.java
	prototypes/Environment/constData.java
Package changes
resolved conflict for merge