Refactored scrolling file
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/bundle.js
added post request to data file
Merge branch 'master' of https://github.com/AdFame/AdFame into feat/userinput
fixed ball demo, added grow demo
Merge pull request #50 from Morgantheplant/feat/userinput

added post request to data file, fixed ball demo and added grow demo
Merge pull request #52 from alezucco/master

db and server
Delete Thumbs.db
Updated transitions to emit on scroll position
Delete .DS_Store
Delete .DS_Store
Merge branch 'master' of https://github.com/AdFame/AdFame
Halted current transition before starting next transition
Merge pull request #53 from pshatara/master

Updated transitions to emit on scroll position