complete tinder style drag and spring
Merge pull request #23 from alezucco/master

complete tinder style drag and spring
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/bundle.js
Added updated scrolling feature
Merge pull request #24 from Morgantheplant/master

Added updated scrolling feature
Updated Transforms
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/bundle.js
	src/AdGenerator.js
Updated AdGenerator