Merge pull request #1 from ZhishenYang/server

Server
Merge pull request #30 from denays/master

Changes to the survey page to add nutrition
Merge remote-tracking branch 'upstream/master'
Add function in server, so that server can call python program, need to fixed add user problem
Merge pull request #31 from denays/master

added nutritional recommend on recommendation.js
Merge pull request #32 from ZhishenYang/master

Add function to server  so that server can call python programs
Fix button problem
Merge pull request #33 from denays/master

added a new div for user's profile info
fix merge conflicts
fixed undefined twitter handle
refactor code and fix issues
refactor html to make it easier to read
fixed twitter issues and other
all sorts of refactoring and fixes
included chats on user page
minor change in user page layout
updates to userpage
Merge branch 'master' of https://github.com/Markko/CSCI3130-Project
add alternate api for tag retrieval
fix merge conflicts