Edited Fickr pics
conflict clean-up
Merge branch 'dev' into thomasdev

bringing down edits
js minor edit
remade indexhtml
fixing index
fixed index
worked on pics
Merge branch 'dev' into thomasdev

updating thomasdev branch
header
Initial food pics complete
merge party
updated
Merge branch 'thomasdev' into dev

updating from my development branch
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into devbranch
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into dev

merging with devbranch
fixed merge conflict
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into devbranch
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into dev

getting updates
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into dev

updated again