Some changes
Merge branch 'master' of https://github.com/vickygx/theFrozzies

Conflicts:
	digital_prototype/groups.html