nose
merged
bug fixes
Merge branch 'master' of https://github.com/OneKorg/Concurso_IDGD_2014