hj
M
erge branch 'master' of git@github.com:tmk1908/organizer.git

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/75/20668c04eda400111ee290a5a5c7276d
	.metadata/.plugins/org.eclipse.core.resources/.history/88/606b9ce39fa400111583cbfe115bf39e
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.indexes/e4/29/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.indexes/e4/9c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.indexes/e4/a5/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Organizer/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/14.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload41.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload42.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload43.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload44.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload45.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload46.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload47.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload48.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload49.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload50.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload51.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload52.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload53.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload54.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload55.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	.metadata/.plugins/org.eclipse.jdt.core/3180259790.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Organizer/2012/5/21/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Organizer/2012/5/21/refactorings.index
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	Organizer/bin/controller/Controller.class
	Organizer/src/controller/Controller.java
	Organizer/src/model/MainFrame.java