making the site personal to me
fixing merge conflicts
Merge pull request #1 from addabjork/master

Randle pull my changes! Helloooo!!!