updating...
Merge branch 'master' of https://github.com/CorpusCallosum/StoryCorpsDataViz

Conflicts:

sc_kw_photo_map/bin/scPhotoFontDebug.app/Contents/MacOS/scPhotoFontDebug
	sc_kw_photo_map/src/scKeyword.cpp
	sc_kw_photo_map/src/testApp.cpp
commiting added ignore for exes