removed one referance
Merge branch 'master' of http://github.com/dave911d/debate
Merge branch 'master' of http://github.com/dave911d/debate
fixed package.json
Merge branch 'master' of http://github.com/dave911d/debate
new package
Yep updated stuff
Merge branch 'master' of http://github.com/dave911d/debate
some fixed
Merge branch 'master' of http://github.com/dave911d/debate
some fixes
yep some stuff
Merge branch 'master' of http://github.com/dave911d/debate
Merge branch 'master' of http://github.com/dave911d/debate

Conflicts:
	npm-shrinkwrap.json
removed dogs,im a horrible person