attempt at filter
working special
resolved html conflict
Specials
added
built flickr html
flickr feed working
eliminated placeholder photos in index.html
holy specials 2x
Fix gulpfile
Merge branch 'dev' into Richard
changed flickr call for france, foods
Merge branch 'dev' into johnworking
synched needs styling. prob with sides
Merge branch 'dev' into joanna

Conflicts:
	app/index.html
	dist/index.html
	dist/scripts/main.js
basic styling done for specials
Placeholders for menu icons
Merge branch 'dev' into dean
bloody dots
Setup menu icons to show appropriate content