My first commit.
Merge branch 'master' of https://github.com/ArrenYu/LD29.git

Conflicts:
	README.txt
jordan's commit.