Jackie - final-Mock
Merge branch 'master' of https://github.com/resh2302/ClassActs

Conflicts:
	03.website/Splash_v4/index.html