first index push
merge conflict fixed
Merge branch 'master' of github.com:tiy-durham-june2014-frontend/team-blue into flickrapi
Minor update to flickr.html
Merge pull request #1 from tiy-durham-june2014-frontend/flickrapi

Flickrapi
Delete .DS_Store

Only needed locally
Repairing .gitignore
Merge branch 'master' of github.com:tiy-durham-june2014-frontend/team-blue
modified gitignore