test
test 0
Merge branch 'master' of https://github.com/smadalin/learn-git

Conflicts:
	javascript/index.html