Merge branch 'master' of https://github.com/abresee/note

Conflicts:
	SConstruct
Merge branch 'master' of https://github.com/abresee/note

Conflicts:
	SConstruct