Changed how inventory handles textbooks and flashdrives

Changed all relevant classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Outside.java