Merge pull request #33 from sparkbox/sign-up

Conflicts resolved!
Merge branch 'master' of github.com:sparkbox/apprentice-application into sign-up