Removed data directory
Merge branch 'master' of github.com:bencates/gowiki

Conflicts:
	data/test.txt
	data/test2.txt