settup testing files
update index xml
adding files
users.txt has changed
Merge branch 'master' of https://github.com/shmueyb/SoftwareFinalProject

Conflicts:
	GRADS_Materials(1)/.idea/workspace.xml
	GRADS_Materials(1)/edu/umn/csci5801/GRADS.java
	GRADS_Materials(1)/edu/umn/csci5801/db/FileAccess.java
	GRADS_Materials(1)/edu/umn/csci5801/test/GRADSTest.java