c2
Merge branch 'work2' into work

Conflicts:
	README.txt
Merge pull request #6 from timnitanda/work

Work