cleanup
Merge pull request #5 from carojane/continuous_integration

cleanup
Merge branch 'master' into user_signs_up