changed
Merge branch 'master' of
https://github.com/Dongkwan/Java_2014_Spring_20094007.git

Conflicts:
	bin/.gitignore