Merge branch 'master' of ssh://pyrite.cs.iastate.edu/~/cs227/workspace

Conflicts:
	.metadata/.log

.metadata/.log

@@ -3658,6 +3658,7 @@ user global configuration and to define the default location to store repositori
 not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
 EGit might behave differently since they see different configuration options.
 This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+<<<<<<< HEAD
 !SESSION 2014-04-16 20:18:16.778 -----------------------------------------------
 eclipse.buildId=4.3.0.M20130911-1000
 java.version=1.6.0_65
@@ -3680,3 +3681,48 @@ Command-line arguments:  -os macosx -ws cocoa -arch x86 -product org.eclipse.epp
 
 !ENTRY org.eclipse.ui 4 4 2014-04-16 20:18:22.148
 !MESSAGE Unable to find Action Set: com_sysdeo_eclipse_tomcat_actionSet
+=======
+!SESSION 2014-04-16 20:18:28.699 -----------------------------------------------
+eclipse.buildId=4.3.0.I20130605-2000
+java.version=1.7.0_51
+java.vendor=Oracle Corporation
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en_US
+Framework arguments:  -product org.eclipse.epp.package.standard.product
+Command-line arguments:  -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.standard.product
+
+!ENTRY org.eclipse.jface 2 0 2014-04-16 20:18:38.039
+!MESSAGE Keybinding conflicts occurred.  They may interfere with normal accelerator operation.
+!SUBENTRY 1 org.eclipse.jface 2 0 2014-04-16 20:18:38.039
+!MESSAGE A conflict occurred for ALT+CTRL+T:
+Binding(ALT+CTRL+T,
+	ParameterizedCommand(Command(org.eclipse.team.svn.ui.command.EditPropertiesCommand,Show Properties,
+		,
+		Category(org.eclipse.team.svn.ui.command.category,SVN,null,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@3ff3b2d5,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(ALT+CTRL+T,
+	ParameterizedCommand(Command(pl.szpinda.plugin.tomcat.commands.tomcatStartStop,Tomcat start,stop,
+		,
+		Category(pl.szpinda.plugin.tomcat.commands.category.key,Tomcat keys,null,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@1861dec0,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+
+!ENTRY org.eclipse.egit.ui 2 0 2014-04-16 20:18:41.688
+!MESSAGE Warning: EGit couldn't detect the installation path "gitPrefix" of native Git. Hence EGit can't respect system level
+Git settings which might be configured in ${gitPrefix}/etc/gitconfig under the native Git installation directory.
+The most important of these settings is core.autocrlf. Git for Windows by default sets this parameter to true in
+this system level configuration. The Git installation location can be configured on the
+Team > Git > Configuration preference page's 'System Settings' tab.
+This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+
+!ENTRY org.eclipse.egit.ui 2 0 2014-04-16 20:18:41.698
+!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
+user global configuration and to define the default location to store repositories: 'U:\'. If this is
+not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
+EGit might behave differently since they see different configuration options.
+This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+>>>>>>> e40a7be4d40d3b005d6297e3fb78680697518ffe

.metadata/.plugins/org.eclipse.core.resources/.history/5d/20396d5acac500131f319a0ae2929937

+/bin
+/bin
+/bin
+/bin
+/bin
+/bin

.metadata/.plugins/org.eclipse.core.resources/.history/98/60e88552cac500131f319a0ae2929937

+/bin
+/bin
+/bin
+/bin
+/bin
+/bin

.metadata/.plugins/org.eclipse.core.resources/.history/c8/b00abc4acac500131f319a0ae2929937

+/bin
+/bin
+/bin
+/bin
+/bin

.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/4/16/refactorings.history

+<?xml version="1.0" encoding="UTF-8"?>
+<session version="1.0">
+<refactoring comment="Delete resource &apos;mini1&apos;" deleteContents="true" description="Delete resource &apos;mini1&apos;" element1="/mini1" flags="7" id="org.eclipse.ltk.core.refactoring.delete.resources" resources="1" stamp="1397695850564"/>
+</session>
\ No newline at end of file

.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/4/16/refactorings.index

+1397695850564	Delete resource 'mini1'