modified:   app/models/Post.php
Merge branch 'master' of https://github.com/mixuuu/lauta

Conflicts:
	app/models/Post.php
	new file:   app/models/Post.php