Updated data input
Updated data input
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/bundle.js
	src/data.js
Removed scroll drag
Merge pull request #48 from pshatara/master

Updated data input and removed scroll drag