Finished our last batch of J-units
Fixed a bug when switching between MainWorld and MemView
Merge remote-tracking branch 'sam/master'

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MemView.java
	GamingWebsite/Junits/edu/ycp/cs320/gamingwebsite/memDeckTest.java
	GamingWebsite/src/edu/ycp/cs320/gamingwebsite/shared/MemDeck.java