Add npm
Add npm
Add friend to recommendation
Merge branch 'master' of github.com:josephktcheung/pdf into facebook
Remove unnecessary codes
Remove unnecessary codes
Merge pull request #19 from josephktcheung/facebook

Facebook
Merge branch 'master' of https://github.com/josephktcheung/pdf
Update fixtures
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 pagination
Merge pull request #20 from josephktcheung/pagination

Finish pagination
Rename location files
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