m
Merge branch 'master' of github.com:morrxy/postit

Conflicts:
	db/schema.rb
a