ok
Merge branch 'master' of https://github.com/tommyact/test

Conflicts:
	home.html