latest
Merge branch 'master' of github.com:jac2130/BayesGame

Conflicts:
	Betting/blog.py
	Betting/blog.pyc
	Betting/blog.py~
	Betting/blogPostDAO.py
	Betting/blogPostDAO.pyc
	Betting/blogPostDAO.py~
	Betting/dataDAO.py
	Betting/dataDAO.pyc
	Betting/dataDAO.py~
	Betting/modelDAO.py
	Betting/modelDAO.pyc
	Betting/modelDAO.py~
	clientScripts/bettingView.js
	clientScripts/core.js
	clientScripts/data.js
	clientScripts/histgram.js
	clientScripts/histgram.js~
	clientScripts/sideBar.js
	clientScripts/sideBar.js~
	clientScripts/switcher.js
	clientScripts/switcher.js~
latest2