working on api, not working
flickr api work
removed files not supposed to be in git
removed my token file
changes
added to gitignore
Merge branch 'dev' of github.com:sushi-group-project/sakura-sushi into dev
merging problems
Merge branch 'dev' of github.com:sushi-group-project/sakura-sushi into mags
working on social icons