initial commit
merge intial git stuff