(fix) added require js back to ball file
(fix) remove compiled file
(feat) added window demo
(feat) add route to window file
Merge pull request #69 from Morgantheplant/fix/ball

(Fix) added require.js back to ball demo
Merge pull request #71 from Morgantheplant/master

added server.js as main in package.json
Merge pull request #70 from Morgantheplant/feat/windowdemo

(Feat) added window demo
Merge branch 'master' of https://github.com/AdFame/AdFame
(feat) added fancy demo pages
Updated generator page style
Merge branch 'master' of https://github.com/AdFame/AdFame
(refactor) added comments to grow demo
Merge pull request #72 from Morgantheplant/feat/adddemopages

(Feat) added demo pages
fix database and requests
db
Merge pull request #73 from alezucco/master

db and server
Updated preview logic
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/userinput/userinput.js
Fixed merge conflicts
(bugfix) made the refresh work for the user input field and display area