first section
Merge branch 'master' of https://github.com/nevor1530/t201403-01

Conflicts:
	css/index.css
	js/index.js
Merge branch 'master' of https://github.com/nevor1530/t201403-01

Conflicts:
	css/index.css
Merge branch 'master' of https://github.com/nevor1530/t201403-01