Just magit test
Merge branch 'master' of https://github.com/budlion/ACM

Conflicts:
	POJ/hello.c
Revert "Just magit test"

This reverts commit fab1e155625a76b9203f3f26f01480cca64661d1.