week
week
Merge branch 'master' of https://github.com/gkrwnsdl3/1407201847 into week

Conflicts:
	140720/src/main.java