Don't try to delete a file that doesn't exist
style update for tables
merge
style update
Merge branch 'master' into pages

Conflicts:
	app/models/post.rb