Merge branch 'master' of https://github.com/AdFame/AdFame
Merge branch 'master' of https://github.com/AdFame/AdFame
Merge branch 'master' of https://github.com/AdFame/AdFame
Modified AdGenerator to accept data input
Updated data object
Modified data.
Merged drag
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/bundle.js
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
Required Easing
Merge pull request #25 from pshatara/master

Modified AdGenerator to accept data object
added touch move scrolling logic. Scrolling still gummy
Merge pull request #26 from Morgantheplant/bug/touchmove

Added touchmove scrolling logic. Scrolling still gummy
drag redirect and animate out  and scroll bug fix
Merge pull request #27 from alezucco/master

drag redirect and animate out  and scroll bug fix
AdGenerator generalized to handle data object
Merge pull request #28 from pshatara/master

AdGenerator generalized to handle data object