From: certifiedloud <certifiedloud@gmail.com>
Date: Thu, 31 Jul 2014 12:11:52 +0000 (-0600)
Subject: Merge pull request #1 from certifiedloud/master
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a0868624c228ff4d731e24dde2f0bc0aafc2106d;p=django_quiz.git

Merge pull request #1 from certifiedloud/master

merging master and dev branches
---

a0868624c228ff4d731e24dde2f0bc0aafc2106d