Done
Merge branch 'master' of github.com:adamwgoldberg/security

Conflicts:
	proj3/ClickMe/assets/cert.crt
	proj3/ClickMe/assets/cert.crt~
	proj3/ClickMe/cert.crt