Merge branch 'flask-cv' of https://github.com/freeslugs/yhack2014 into flask-cv
Merge branch 'flask-cv' of https://github.com/freeslugs/yhack2014 into flask-cv