Testing line-endings
Merge branch 'master' of https://github.com/Richtermeister/simple-ups

Conflicts:
	LICENSE