initial commit
Work in progress
initial commit
Merge branch 'master' of github.com:fedwiki/wiki-gem

Conflicts:
	README.md