Milestone2
Merge branch 'glek2.0' of https://github.com/glek/3303-group-project into Mike
temp
2.0 update
Rebuilding the documentation and minor changes in client.
New flashy admin client
Merge branch 'Karen2' of https://github.com/glek/3303-group-project into Mike

Conflicts:
	docs/readme.txt
Merge branch 'glek2.0' of https://github.com/glek/3303-group-project into Mike

Conflicts:
	src/com/mike/AdminClient.java
Code cleanup and added comments