changed add medthod
update merge

Conflicts:
	css/style.css