initial commit
merge conflict cray
cleanup for github page