Serialization for classes and print statement for login testing
Prepare to merge
Merge forry's fixes, tried fixing some more

Conflicts:
	TV Tracker/.classpath
Merge remote-tracking branch 'chris/master'

Conflicts:
	TV Tracker/.classpath