merging master
adding Gruntfile
merging updated package.json file
initial gruntfile and updated package.json for grunt dev dependancies
merging updated package.json file"
merging new server changes from jesse
fixed some of the functions on routes toget the right callbacks for fixing the fb auth
merginging nib
Merge pull request #25 from kamalama/authentication

Authentication