adding description to resources table
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140509205739_create_resources.rb