Normalize line endings
Merge branch 'master' of github.com:jimguys/poemlab

Conflicts:
	deploy/startup.sh