initial commit. everything seems ok right now
merging github