Merge branch 'master' of github.com:ponderingpanda/ponderingpanda.dev
Merge branch 'master' of github.com:ponderingpanda/ponderingpanda.dev

Conflicts:
	.gitmodules
Included default tech user in sql