First commit
Trying to screw up others by changing text.
Let's see how this goes.
Merge branch 'master' of //WIN7DEV/Users/Public/Documents/CodingProjects/orchestra

Conflicts:
	src/com/limech/orchestra/server/Main.java
Testing doing some work on branch.
Will replace comment
Added some stuff on my branch.
On my other branch, doing similar work.
Merge branch 'master' of https://github.com/Limech/orchestra