modified:   augustus/src/base.js
	modified:   augustus/src/lock.js
	modified:   augustus/src/merger.js
	modified:   caligula/Makefile
	modified:   augustus/src/lock.js
	modified:   augustus/src/merger.js
	modified:   caligula/Makefile
Revert "	modified:   augustus/src/lock.js"

This reverts commit 9f63768bd11ab7670c8b3d96a3b67123812f0498.

	modified:   augustus/src/lock.js
	modified:   augustus/src/merger.js
	modified:   caligula/Makefile
Merge pull request #14 from whyreal/master

some little bugs & uncommit changes done by yourself, please ignore the newline-changes