now u must log in to use any functionality
Merge pull request #29 from myclamm/facebookWorks

now u must log in with facebook to use any functionality
(feat/Recommendations) Hooked up reccomendations to database)
Merge pull request #30 from wykhuh/feat/recommend

(feat/Recommendations) Hooked up reccomendations to database
Merge branch 'master' of https://github.com/GoldenLions/Artproject into feat/autocomplete

Conflicts:
	client/www/.DS_Store