Merge pull request #40 from permalife/danny

Danny
Merge pull request #41 from permalife/danny

Danny
signup
Merge branch 'master' of http://github.com/nickolashe/zaplings-full
Merge pull request #42 from permalife/danny

signup
sign in
sign up
Merge branch 'master' of http://github.com/nickolashe/zaplings-full
signup + login
Merge pull request #43 from permalife/master

danny