next try using submodules
Merge branch 'master' of github.com:arc42/aquagrails

Conflicts:
	src/docs