Initial commit
init
empty commit
backgound options
merge
line ending fixed to windows
Merge branch 'master' of github.com:danyan/background

Conflicts:
	README.md
	index.html
	lib/pxxl.js
remove node modules