Git hook test
Git hook test
Merge branch 'master' of guiness.magic.ubc.ca:/opt/ckanext-wotkit
Update readme on test server deployment info
Update readme on test server deployment info
Merge branch 'master' of guiness.magic.ubc.ca:/opt/ckanext-wotkit

Conflicts:
	README.md
Test server deploy test