modified:   gui_mainLayout.py
	new file:   ../.idea/.name
	new file:   ../.idea/dictionaries/boulefi.xml
	new file:   ../.idea/encodings.xml
	new file:   ../.idea/inspectionProfiles/Project_Default.xml
	new file:   ../.idea/inspectionProfiles/profiles_settings.xml
	new file:   ../.idea/misc.xml
	new file:   ../.idea/modules.xml
	new file:   ../.idea/planarradpy.iml
	new file:   ../.idea/scopes/scope_settings.xml
	new file:   ../.idea/vcs.xml
	new file:   ../.idea/workspace.xml
	modified:   gui/gui_Layout.py
	modified:   gui/gui_Layout.pyc
	docs/SDC/Previews/
	inputs/batch_files/batch_test_boulefi.txt
	inputs/bottom_files/ger_sand17.csv
	inputs/iop_files/b_P0.5_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/iop_files/b_P1.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/iop_files/b_P10.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/iop_files/b_P5.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/iop_files/c_P0.5_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/iop_files/c_P1.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/iop_files/c_P10.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/iop_files/c_P5.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	inputs/phase_files/pf_petzold_mono_HL_18x24_params.txt
	inputs/sky_files/sky_clear_z45_a50_17_HL_18x24
	inputs/sky_files/sky_clear_z45_a50_17_HL_18x24_params.txt
	inputs/surface_files/sf_coxmunk_w5_r10_s200_yes_mono_HL_18x24_params.txt
	libplanarradpy/__init__.pyc
	libplanarradpy/logger.pyc
	libplanarradpy/planrad.pyc
	libplanarradpy/planrad.py~
	libplanarradpy/state.pyc
	log/libplanarradpy.err
	log/libplanarradpy.log
	outputs/unit_test_3/
	planarrad.py~
	tests/Untitled Document~
	new file:   docs/SDC/Previews/ReverseTab.png
	new file:   docs/SDC/Previews/Tab1.png
	new file:   inputs/batch_files/batch_test_boulefi.txt
	new file:   inputs/bottom_files/ger_sand17.csv
	new file:   inputs/iop_files/b_P0.5_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/iop_files/b_P1.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/iop_files/b_P10.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/iop_files/b_P5.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/iop_files/c_P0.5_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/iop_files/c_P1.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/iop_files/c_P10.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/iop_files/c_P5.0_X2.0_Y3.0_G4.0_S4.0_Z2.0
	new file:   inputs/phase_files/pf_petzold_mono_HL_18x24_params.txt
	new file:   inputs/sky_files/sky_clear_z45_a50_17_HL_18x24
	new file:   inputs/sky_files/sky_clear_z45_a50_17_HL_18x24_params.txt
	new file:   inputs/surface_files/sf_coxmunk_w5_r10_s200_yes_mono_HL_18x24_params.txt
	modified:   gui_Layout.py
	modified:   gui_Layout.pyc
	modified:   gui_Layout.ui
	modified:   gui_mainLayout.py
Merge branch 'boulefi' of https://github.com/marrabld/planarradpy into boulefi

Conflicts:
	.idea/workspace.xml
	deleted:    .idea/workspace.xml
	gui/Icons/
	gui_Layout.py
	outputs/unit_test_3/
Merge branch 'boulefi' of https://github.com/marrabld/planarradpy into boulefi