update test
update
update
Merge branch 'master' of github.com:surzycki/prettycool

Conflicts:
	.env.development
	.env.test