edits
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/JessicaSarah.iml
css changed for close x