merging master
adding Gruntfile
merging updated package.json file
update package.json to fix dependency on deprecated thing
Merge pull request #22 from nourishme/fixpackagejson

update package.json to fix dependency on deprecated thing
initial gruntfile and updated package.json for grunt dev dependancies
merging updated package.json file"
updated server.js to pull port number from configfile.js so server opens on correct port
Merge branch 'master' into fixpackagejson
Merge pull request #23 from nourishme/fixpackagejson

fix to pull port from configfile.js
last stab at responsive grid
Merge branch 'frontend' into flexbox
linting
merging new server changes from jesse
added nib to node modules
Merge branch 'master' into flexbox
fixed some of the functions on routes toget the right callbacks for fixing the fb auth
Merge pull request #24 from KyleW/flexbox

added nib
pulling nib update
merginging nib