Merge pull request #11 from bigdred777/master

merge website updates
html files build off of a base file
update to new tipbot history
Merge pull request #31 from Doomhammer458/master

Update website and history