fix schema
Merge branch 'master' into feature/4_post_page

Conflicts:
	db/schema.rb
Merge branch 'feature/4_post_page'
Merge branch 'master' into feature/5_users_login