Added google and flickr to index; photo collage in place (not animated yet)
Removed bower components from ignore
Merge pull request #2 from tiy-durham-june2014-frontend/apis

1st merge of apis with master
Merge master branch and resolve conflicts