ajax call start
add most actions by country and ending soon
Merge pull request #6 from datakind/twitter-feed

Twitter feed
now adding in cleaned up cat mappings
Merge branch 'master' of https://github.com/datakind/amnesty
commenting out pandas stuff for server
Updated index.html to remove depency on local hosting and dropdown now works
readme removed
Merge branch 'master' of https://github.com/datakind/amnesty

merge with master
ok, cat_mapping is working now
Merge branch 'master' of https://github.com/datakind/amnesty
add images
add images
Merge branch 'master' of github.com:datakind/amnesty
site should now work
Merge branch 'master' of https://github.com/datakind/amnesty into mshvarts-dev

Conflicts:
	data_munging/iso3-encoding.R