Add npm
Add npm
Merge branch 'master' of https://github.com/josephktcheung/pdf
Merge branch 'master' of https://github.com/josephktcheung/pdf into css
Build the css structure of the recommendation list
Add viewport for mobile layout
Finish first draft of recommendations index page css
Merge branch 'master' of https://github.com/josephktcheung/pdf into css

Conflicts:
	client/styles/main.scss
	client/views/main.html
	client/views/recommendations/recommendations_list.html
	packages/.gitignore
	smart.json
	smart.lock
Fix conflicts and add scss file
Change image dimension
Change file name to index
Add css for friends autocomplete form and profile listing
Add css to recommendation edit
Move recommendations list from index page to edit page
Add structure to recommended item
Add css to sign up page
Merge branch 'master' of https://github.com/josephktcheung/pdf into css

Conflicts:
	client/views/recommendations/edit.html
	client/views/recommendations/index.coffee
	client/views/recommendations/show.html
Update recommendation with session of targetUser
Merge branch 'master' of https://github.com/josephktcheung/pdf into css

Conflicts:
	client/views/recommendations/edit.coffee
	client/views/recommendations/edit.html
Merge conflict