Merge branch 'dev' of github.com:bynite/nicholasteichertcom into dev

Conflicts:
	includes/inc.head.php
	index.php
remove affiliate link
Merge branch 'dev' into release

Conflicts:
	includes/inc.head.php