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

Conflicts:
	drupal_db.sql
fssdf