Fixing up some caching
Merge branch 'master' of
https://github.com/masonremy/csem552fmc3remyw.git

Conflicts:
	proj/TwitterNode.java