Merge pull request #48 from pshatara/master

Updated data input and removed scroll drag
added ids to input fields, grabbing data from fields with jquery
remove comma typos
added origin to data and input fields
remove errors from data file
added settings pane to frame file
(feat) created toggle for transitions and output of number details on sliders
Added stylessheet to input field
move stylesheet to top
Merge pull request #49 from Morgantheplant/feat/userinput

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

Conflicts:
	public/bundle.js