latest and greatest
Merge branch 'master' of https://github.com/familiar-studio/Change-Machine

Conflicts:
	changemachine.dev.crt
	changemachine.dev.key
updated ignore