claudia diles
Merge branch 'master' of https://github.com/resh2302/ClassActs

Conflicts:
	.gitignore