Fixing on laptop
Adding new class for variables (Hours 5)
Adding new class for variables (Hours 5)
Merge origin/master

Conflicts:
	src/com/java24hours/Salutation.java
Merge origin/master

Conflicts:
	src/com/java24hours/Salutation.java