chan
Merge branch 'master' of https://github.com/islameldesokycross/Halakat

Conflicts:
	gitSC/halakat/states/halakat/plans/plans-temp.html