Tweaked location ip
Merge branch 'master' of github.com:viralhunter/LargeScaleInfoA2

Conflicts:
	build/classes/server/LargeScaleInfoA2.class
	src/server/LargeScaleInfoA2.java
Merge branch 'master' of github.com:viralhunter/LargeScaleInfoA2

Conflicts:
	build/classes/server/LargeScaleInfoA2.class
	proj_1a/build/classes/server/LargeScaleInfoA2$GarbageCollector.class
	proj_1a/src/server/LargeScaleInfoA2.java
Fixed version number in cookie bug