update
Merge branch 'master' of github.com:fenix20113/Drupal-homework

Conflicts:
	themes/bartik/css/colors.css
	themes/bartik/css/style.css
update2