merging master
adding Gruntfile
merging updated package.json file
initial gruntfile and updated package.json for grunt dev dependancies
merging updated package.json file"
linting
merging new server changes from jesse
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
Merge pull request #25 from kamalama/authentication

Authentication
fixing serialize and deserialize because User wasn't defined (will be defined when db is implemented)
merging most recent auth changes
Merge pull request #26 from kamalama/authentication

Authentication
Merge branch 'master' into flexbox