Merge branch 'c1moore_branch' into dev
Merge branch 'dev' of github.com:c1moore/cen3031project into dev
Really fixed issue #7
Updated to use bower.json for dependencies
Merge branch 'james_branch_2' into dev
Modified package.json to include formidable.
Merge branch 'c1moore_branch' into dev
Merge branch 'dev' of github.com:c1moore/cen3031project into dev
commented out a line in comment.routes.serer.controller.js.  fixed a formidable error while running grung (commented out mv)
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Merge branch 'james_branch_2' into dev
Merge branch 'dev' of github.com:c1moore/cen3031project into dev