Merge pull request #10 from omarbelkady/alan

Alan

Author: omarbelkady

Constructors/Cat.java

@@ -37,4 +37,3 @@ public void eat(int x)
 }
 
 
-Say if I use the protected keyword what happens say to the protected String name. Well, only items within the same package or are sub classes of the class will be able to access this variable name. Therefore, in our case, Main and Cat will be the only ones able to use the function. However, say I create a 2nd package this package will not be able to see this.

EqualsAndHashcode/User.java

@@ -32,10 +32,10 @@ public String output(boolean nice)
 	{
 		if(nice)
 		{
-			return "You\'re an awesome person"+ " "  + getFullName() + ".";
+			return "You're an awesome person"+ " "  + getFullName() + ".";
 
 		}
-		return "You\'re an idiot"+ " "  + getFullName() + ".";
+		return "You're an idiot"+ " "  + getFullName() + ".";
 	}
 
 	public String getFirstName()
@@ -47,7 +47,7 @@ public String getFirstName()
 	public void setFirstName(String fN)
 	{
 		//Assigning the fName value we pass in to the field firstName
-		fN=firstName;
+		fN = firstName;
 		//the .trim at the end will raise a null pointer exception because 
 		//it doesn't know what are we referencing
 		//the .strip remove any whitespaces before output.

commit.sh

@@ -0,0 +1,5 @@
+#!/bin/bash  
+git pull origin master
+git add .
+git commit -m "$*"
+git push origin alan