init commit
merge from github init stuff