Squashed commit of the following:

commit 3a8e7e086bcd5f58e844396a3552f7630934f7d4
Author: gulfa <gunnarroe@gmail.com>
Date:   Wed Apr 3 12:46:36 2013 +0300

    Using the new API for dashboard

commit ea26eacc0116728e006534a3f33b8c73a4e28009
Merge: f55784c 435c82f
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 11:38:18 2013 +0300

    Merge branch 'master' into develop

commit f55784cf2cf97365153b633c11f4e64ddee0e1e1
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 10:36:21 2013 +0300

    Adding Flickr API key

commit 608fa4898fd1adbd944e485943bc076e1c83a5d0
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 10:06:57 2013 +0300

    Adding link to Charity Comission page in footer

commit 5e3a084586fb6236f713582bb2dfed49dabcbefc
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Tue Apr 2 17:59:17 2013 +0300

    Adding initial Flickr config

commit a9dbe8557799d1db371c2c5f3cbe27b77f6952f5
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Tue Apr 2 09:58:35 2013 +0300

    Removing load_numbers() from dynamic dashboard-hiv.js

commit f31e5621a4518a8fceea9505b124ebf242dc0418
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Tue Apr 2 09:53:44 2013 +0300

    Updating projects/hiv
Merge branch 'master' of github.com:uamuzibora/uamuzibora.org
Resolving conflicts

Conflicts:
	assets/js/dashboard/data_hiv.js
	assets/js/dashboard/data_mch.js
Squashed commit of the following:

commit 3c0de32ce62bc0508a6bb1812277dadd2989af19
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 14:11:49 2013 +0300

    Minfying and using Google to serve jQuery and webfonts

commit d439af161a7b06edab87ef7fe3375b1fda5ef977
Author: gulfa <gunnarroe@gmail.com>
Date:   Wed Apr 3 13:08:58 2013 +0300

    Fixed method for dashboard

commit 621d83d1a27d282ce87508c426998351303f7cc5
Merge: faaf6bd 3a8e7e0
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 13:02:02 2013 +0300

    Merge branch 'develop' of github.com:uamuzibora/uamuzibora.org into develop

commit 3a8e7e086bcd5f58e844396a3552f7630934f7d4
Author: gulfa <gunnarroe@gmail.com>
Date:   Wed Apr 3 12:46:36 2013 +0300

    Using the new API for dashboard
Merge branch 'develop'

Conflicts:
	assets/css/custom.css
Squashed commit of the following:

commit e10e6183325e07c748a674434ff17a8e56350999
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 14:32:45 2013 +0300

    Google's Titillium is broken; let's use our own
Merge branch 'develop'

Conflicts:
	assets/css/custom.css
Merge branch 'develop'

Conflicts:
	assets/css/custom.css
Fixing typo
Squashed commit of the following:

commit 9466b0c57c1367f0a6c3fd5642b6c8fa8764b2eb
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 15:06:55 2013 +0300

    Fixing typo
Adding 404 error page
Merge branch 'develop'
Adding 404 error page
Merge branch 'develop'
Typo
mend