20140105-2-5

Conflicts:

	README.md
20140113
afternoon commit