trying to get heroku working. adding package.json. git doing weird things, thinks i'm ahead by two commits. adding stuff it says is modified