A small conflict in Helpers
Merge branch 'master' of https://github.com/k3larra/SkanetrafikenAPI.git

Conflicts:
	SkanetrafikenAPI/src/se/mah/k3lara/skaneAPI/control/Helpers.java