Blog post about SciPy 2014
Minor fixes to blog post
Updating links to videos
Merge pull request #557 from gvwilson/blog-scipy-talks

Blog post about SciPy 2014
Single category for blog post
Merge branch 'master' of github.com:JorySchossau/site into wssspe-assessment
Add a teacher training registration form
* should this be renamed to request?
* waiting for questions to be updated
* need to test if the form responses are emailing admin@software-carpentry.org
Figures and formatting for WSSSPE assessment paper
Fix broken images in paper, since I didn't have the original material some of the figures are now B/W
Merge pull request #560 from gdevenyi/master

Fix broken images in paper
Reformatting to get into 4 pages
Adding some overdue badges
About to start moving figures
Moving figures/ directory contents into this directory to support arXiv submission
Merge branch 'making-badges'
Adding Jason Williams
Update questions to relect Greg's changes on the Google form
Update form
Merge pull request #559 from acabunoc/master

Add a teacher training registration form
Making instructor training more findable