rabbi changing
bal commit
Merge branch 'master' of https://github.com/bdraju/qc.git

Conflicts:
	index.php