My website This is a really awesome website. Updates made on master on GitHub before rebase. <<<<<<< HEAD Repository purpose This will be a change that conflicts with whatever is on the remote side. This was edited locally. Purpose This file is just a readme file. c310b0bbd5c70abda78c08318de3f70b54073381