Initial commit
Merge with github
Trying to fix merge mess
merge still not right