Ignoring Files
added student stuff
Merge remote-tracking branch 'origin/fcBranch'

Conflicts:
	CZAOS/.gitignore
	CZAOS/CZAOSWeb/.gitignore
Merge remote-tracking branch 'origin/master' into Jay