fuck meeeee dammit
Merge branch 'master' of https://github.com/JamesKegel/Newsbeard

Conflicts:
	index.html
	newsbeard.css
klhgkjhdh
hmmm