my first commit
First commit. Adding a README.
Added the time
Added date message
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hello.java
Fixes bug #1
Merge