desktop
Merge remote-tracking branch 'origin/master'

Conflicts:
	AU2014/CSE_2231_SW2/workspace/.metadata/.log
	AU2014/CSE_2231_SW2/workspace/.metadata/.mylyn/tasks.xml.zip
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.cdt.core/.log
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Glossary_Project10/.markers
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Homeworks/.markers
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Lab1_SequencePalindrome/.markers
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Project01_WordCounter/.markers
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	AU2014/CSE_2231_SW2/workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	AU2014/CSE_2231_SW2/workspace/.metadata/version.ini