a
Merge branch 'master' of
https://github.com/Dongkwan/Java_2014_Spring_20094052.git

Conflicts:
	bin/lab/quiz1/quiz16.class
	src/lab/quiz1/quiz16.java
as