ChaTo's review.
Files that were not tracked.
Merge branch 'master' of github.com:qcri-social/aidr-website

Conflicts:
	css/main.css
	css/screen-foot.css
Conflicts ok.
Added files.