adds reset-scroll, removes old images
Merge pull request #21 from wikitongues/reset-scroll

adds reset-scroll, removes old images
Merge branch 'master' into nodemailer

Conflicts:
	js/scripts/fixtures/team.js