Merge pull request #17 from denays/master

Adding pics file
Jasmine test for login 1
Merge pull request #18 from dhuha/master

The page seems perfect! Finish code review, will do test soon
adding login page
Merge pull request #19 from dhuha/master

adding login page
some code added to user_login.html
Add twitter login function and modify survey html
Merge pull request #20 from dhuha/master

some code added to user_login.html, Will test login page with app.js server program
Add twitter data retrieve functions
new page for workout information form
Merge pull request #23 from dhuha/master

new page for workout information form, need to do test
Merge pull request #22 from ZhishenYang/social_media

Add twitter data retrieve functions
Add oauth_key
Merge pull request #24 from ZhishenYang/social_media

Add oauth_key
Add tweet data retrieveing function
Merge pull request #21 from ZhishenYang/server

Add twitter login function and modify survey html
Modify retrieve functions
Merge pull request #25 from ZhishenYang/social_media

Social media
Modify test function
Merge pull request #26 from ZhishenYang/social_media

Modify test function