Merge branch 'master' of git://gitorious.org/ozzloy/challenge-bot
[challenge-bot] / phase2 /
2013-07-30 daniel watsonadd code for phase0 through phase3