c2
c3
Merge pull request #3 from timnitanda/work3

c3
Merge branch 'work2' into work

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

Work