Root (lesson 4)
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Root (lesson 4)
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Root (lesson 4)
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Root (lesson 4)
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Lesson 5 - Expansion using the classes built in the system. Built a simple text clock using java.util.*
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Lesson 5 - Expansion using the classes built in the system. Built a simple text clock using java.util.*
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/java24hours/BlankFiller.java
	src/com/java24hours/Clock.java
	src/com/java24hours/Dice.java
	src/com/java24hours/Root.java

Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/java24hours/BlankFiller.java
	src/com/java24hours/Clock.java
	src/com/java24hours/Dice.java
	src/com/java24hours/Root.java
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/java24hours/BlankFiller.java
	src/com/java24hours/Clock.java
	src/com/java24hours/Dice.java
	src/com/java24hours/Root.java
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/java24hours/BlankFiller.java
	src/com/java24hours/Clock.java
	src/com/java24hours/Dice.java
	src/com/java24hours/Root.java
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>