test6
ddd
Merge branch 'master' of https://github.com/sagivf/bootstrap-sass

Conflicts:
	test.txt
merged