test git commit
test push bang git
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/UserController.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	editcode/tryit.php