Added a little content, mostly to test my puppet/cron setup for updating the site
Merge branch 'master' of https://github.com/joshsamuelson/website

Conflicts:
	index.html