.
Merge branch 'master' of https://github.com/Aravs7/betz

Conflicts:
	app/routes.py
	app/templates/home.html
	app/templates/layout.html
	bin/activate
	bin/activate.csh
	bin/activate.fish
	bin/easy_install
	bin/pip
	bin/python