Added IP_to_lanex_nobend
Merge branch 'master' of github.com:joelfrederico/ButterflyEmittancePython

Conflicts:
	beamlines.py