initial commit
merged with github stuff