initial commit
ignore node stuff
fixing conflicts