home
home
Merge branch 'master' of github.com:Novamantic/classified

Conflicts:
	app/views/posts/index.html.haml