init
Merge branch 'master' of github.com:fforbeck/geduca.org

Conflicts:
	.gitignore