latest push, added a CodeChef section (but stopped working on it); and started working on some command-line java in terminalIde
Merge branch 'master' of github.com:s7hoang/test

Conflicts:
	test