test1

for android 2.3
Merge branch 'master' of https://github.com/flamyfox/html

Conflicts:
	css/style.css
	js/script.js