Initial commit
Merge branch 'master' of github.com:jickpictures/grappl

Conflicts:
	.gitmodules
	README.md
	public/wp-config.php