made a change
made other changes
added a new footer [issue 53]
fixed the broken email address
Merge branch 'testing'
test
Conflicts:
	README_test.txt
Merge branch 'iss53'