updates
stuff

Merge branch 'master' of https://github.com/kmcnally26/my_wiki

Conflicts:
	Apache/SSL_self_signed_in_2_mins.txt