modified gruntfile, login works now
login done
merge navigation back to index
put navigation into index
fixed merge conflicts between cal branch and current branch