Merge pull request #59 from Morgantheplant/master

(feat) added campaign to user input
get request router
AdGenerator refactored to pull from DB
Merge branch 'master' of https://github.com/AdFame/AdFame
Merge pull request #61 from pshatara/master

AdGenerator refactored to pull from DB
regex parser for get request
image upload
Trying to add demos to browserify seed
save image into database
Merge pull request #62 from alezucco/master

(feat)Save images into mongodb
Styled user input page and added simple preview
rebase
Merge pull request #63 from alezucco/master

analytics post requests and golf game
Added iFrame image to assets
analytics
Merge pull request #64 from alezucco/master

analytics
Delete .DS_Store
Delete .DS_Store
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/userinput/inputfield.html
	public/userinput/userinput.js
Merge conflict resolution