Merge remote-tracking branch 'upstream/working' into working
Shotaro's User Interface with Console
Temporary state before downloading JodaTime
Merge remote-tracking branch 'upstream/working' into working
User interface half done
Merge with Michael
Merge pull request #13 from andhieka/working

Merge Andhieka and Michael. Working on UI.