connection to api
Merge branch 'master' of https://github.com/fiery-skippers-2014/Festifind into flickr_api_integration

merge
api flickr
api
merge"
exit
push
flickr feed UP
merge
Finalizing App for deployment to Heroku before 5pm presentation

Merge branch 'master' of https://github.com/fiery-skippers-2014/Festifind into fb_oauth
Pulling flickr_api_integration to resolve local conflicts before deployment

Merge branch 'flickr_api_integration' of https://github.com/fiery-skippers-2014/Festifind into flickr_api_integration
css style
Merge pull request #15 from fiery-skippers-2014/flickr_api_integration

Flickr api integration