Epoch
Renamed a few things
Merge branch 'master' of github.com:deceax/DGCaddy

Conflicts:
	.gitignore