- I did stuff. I don't know what. Scary.
-updated gitignore to remove sensitive student information
-updated gitignore to remove sensitive student information
-updated gitignore to remove sensitive student information
Updating across un-synced machines

Updating because several machines didn't sync correctly.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml