init on my own MacBook Pro
init on my MacBook Pro again
Merge branch 'master' of https://github.com/signifor/signifor-test

Conflicts:
	db/test.sqlite3
	log/development.log
	log/test.log
	tmp/cache/assets/test/sprockets/26098b294d10eec3e946bb124334e5e4
	tmp/cache/assets/test/sprockets/b8d42949e061501a753d0e3a8be12522