Flick Feed
Merge branch 'master' of https://github.com/ashleybaxter/glasgow-photo-walks

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/static/index.html.erb