changes to server.py
Merge branch 'master' of https://github.com/arnfred/Crossroads
Merge branch 'master' of https://github.com/arnfred/Crossroads
Changed a few things here and there
Merge branch 'master' of https://github.com/arnfred/Crossroads

Conflicts:
	static/js/graph.js
	static/templates/pane.html
Merge branch 'master' of https://github.com/arnfred/Crossroads

Conflicts:
	templates/main.html
Fixed problem with recommender and some depreciation errors
Merge branch 'master' of https://github.com/arnfred/Crossroads

Conflicts:
	recommender.py