Merge branch 'master' of github.com:log0ymxm/epsilon-recommender

Conflicts:
	recommender/views.py
r your changes. Lines starting
Added genre.html
Move file for organization purposes
Implement basic recommendation provider
Hide explicit sql logging
Merge branch 'master' of github.com:log0ymxm/epsilon-recommender

Conflicts:
	recommender/models.py
	recommender/settings.py
	recommender/views.py
Merge branch 'master' of github.com:log0ymxm/epsilon-recommender

Conflicts:
	recommender/views.py