Changed
Saving to avoid conflict
Merge branch 'master' of https://github.com/kazemzad/Hava-2.0

Conflicts:
	index.html