test.html
	new file:   test.html
	modified:   test.html
	modified:   test.html
	modified:   test.html
	modified:   test.html
 modified:   test.html
Merge branch 'develop' into behnam

Conflicts:
	test.html

	modified:   test.html
Revert "	modified:   test.html"

This reverts commit f1bbe90376cb23f87c6556e6745ba9018e872590.

	modified:   test.html
	modified:   test.html
Revert "	modified:   test.html"

This reverts commit 16098cf5585e3dc6588d0a8349f169e7fce8a205.

	modified:   test.html
	modified:   test.html
232

233

This reverts commit 9b2a20c42bb2e1aa3abf8d784ea361778a08c448.

	modified:   test.html

	234
two commits merged
fast-forwardse
fast forwarded?
new feature
hot fix happened
new feature done
messages goes to master