methods necessary for dataStore
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/data/DataStore.java