started HTML
wireframe and google map added
added more flickr API stuff
merging
pictures are finally showing up
syncing more changes