first commit on what may eventually be a website
merging