for update
Merge branch 'dev' into working

Conflicts:
	lab02/Client.java
Merge branch 'dev' of https://github.com/plumer/diki into dev
2014-11-29 noon

commit changes made in the morning
change ui(apply substance.jar)
Merge branch 'dev' of https://github.com/plumer/diki into dev

Conflicts:
	lab02/Card.java
	lab02/Client.java
	lab02/Entry.java
	lab02/Server.java
	lab02/User.java
ui and encode=utf8(with unix format)
1. eclipse->window->preferences->general->workspace
2. at the end of the settings: 
	others->utf-8
	unix
make no error(but lots of warning)
and encode=utf-8(unix format)
utf-8 and unix format
utf8 and unix format
add a .gitignore in diki/
2 .gitignore
diki/.gitignore
diki/lab02/.gitignore
Merge branch 'dev'

Conflicts:
	lab02/Entry.java