idk what i did
resolve conflict
Merge branch 'master' of https://github.com/horsejockey/murder-mystery

merging.
started syncing down data, got basic auth working.
fixing merge conflict