fix conflict in db
merge conflict fix
add sign in acceptance test
Merge branch 'master' of github.com:bitsculpt/starboundplanets into scott
Merge pull request #11 from bitsculpt/scott

Acceptance tests for logging in