Add pic feed
Merge branch 'master' of https://github.com/codexa/pictroid

Conflicts:
	public/stylesheets/style.css